diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 00:21:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 03:31:02 +0100 |
| commit | 3976c50fc1ff2fe4e7c224791cecc0faacbe8274 (patch) | |
| tree | f922fcb94450abb8b0a1d87d954d81fed5494853 /libavcodec/adpcmenc.c | |
| parent | 572ccbd299f0aeb3c7f9661752bd111497f08166 (diff) | |
| download | ffmpeg-3976c50fc1ff2fe4e7c224791cecc0faacbe8274.tar.gz | |
Merge commit 'cec5ce49229d61e4eb1f331a6d0dff3aa24f6655'
* commit 'cec5ce49229d61e4eb1f331a6d0dff3aa24f6655':
cdxl: remove an unused variable
c93: use the AVFrame API properly.
bethsoftvid: use the AVFrame API properly.
avs: use the AVFrame API properly.
Conflicts:
libavcodec/bethsoftvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 21c41e76d7c1ddaadafc9da50e99db51358f3754)
Conflicts:
libavcodec/avs.c
Author of the merged code: Anton Khirnov
Diffstat (limited to 'libavcodec/adpcmenc.c')
0 files changed, 0 insertions, 0 deletions