diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-11 22:50:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-11 22:50:22 +0200 |
| commit | 4f6df20a008e52e767550e1ea94280a15c1408b6 (patch) | |
| tree | 85c15434d2d725cd018a878f7bef75ee13765817 /libavcodec/a64multienc.c | |
| parent | 8e357e8e759b36e5609ccd12a9e324aee0e8afc8 (diff) | |
| parent | e1ce756844e684876318570dcebc74bc66c084f0 (diff) | |
| download | ffmpeg-4f6df20a008e52e767550e1ea94280a15c1408b6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avplay: Don't free video filters string until the end of decoding.
movenc: small refactor mov_write_packet
movenc: remove redundant check
interplayvideo: fix av_dlog parameter type mismatch
Drop some pointless #ifdefs.
Conflicts:
libavcodec/interplayvideo.c
libavcodec/libxvidff.c
libavcodec/snowenc.c
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/a64multienc.c')
0 files changed, 0 insertions, 0 deletions