root
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
76,901 Commits 38 Branches 415 Tags 533 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
Michael Niedermayer a2bc6c116d Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c' 
* commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c':
  lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.

Conflicts:
	doc/APIchanges
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-16 02:05:29 +01:00
Tim Walker c98f3169bf lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type. 2014-02-15 22:24:53 +01:00