diff options
| author | Michael Niedermayer <[email protected]> | 2013-11-17 01:48:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-11-17 01:55:38 +0100 |
| commit | fe3808eddee81ce4712d1e729fa6fe619f1685c8 (patch) | |
| tree | cedf1b912ffed79311b5beb8b8d9f4196fa261b6 /libavcodec/zerocodec.c | |
| parent | 9f890a165666a73376c73b3c2bd920345b5c3b79 (diff) | |
| parent | a837c4f2df96a30bf9aa4115b426d608487c7101 (diff) | |
Merge commit 'a837c4f2df96a30bf9aa4115b426d608487c7101'
* commit 'a837c4f2df96a30bf9aa4115b426d608487c7101':
zmbvenc: use the AVFrame API properly.
flicvideo: use the AVFrame API properly.
smacker: use the AVFrame API properly.
mmvideo: use the AVFrame API properly.
Conflicts:
libavcodec/flicvideo.c
libavcodec/mmvideo.c
libavcodec/smacker.c
libavcodec/zmbvenc.c
See: 76e27b1d0594199b4b1ff8520312069f42373944
See: 099e57bc38d7e53cf6823dfec349ff9fdaee99ba
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/zerocodec.c')
0 files changed, 0 insertions, 0 deletions