diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 01:48:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 03:31:47 +0100 |
| commit | bfe4aa892a53a7586b5e51211171e61c4b5c461c (patch) | |
| tree | 7f1a3b7082f847d8c6195321db9fd5a160b1a35d /libavcodec/gsm.h | |
| parent | 1dcf9de6e995fb58a2514ab6fae9627a5e3481a3 (diff) | |
| download | ffmpeg-bfe4aa892a53a7586b5e51211171e61c4b5c461c.tar.gz | |
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 <michaelni@gmx.at>
(cherry picked from commit fe3808eddee81ce4712d1e729fa6fe619f1685c8)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gsm.h')
0 files changed, 0 insertions, 0 deletions