diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 17:59:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 18:00:02 +0200 |
| commit | f48d1fb167202cb1ccef29e067436024e7068792 (patch) | |
| tree | 064c76e4cb35357bb993a634f89b144151b3ee5a /libavcodec/cinepak.c | |
| parent | 79234907128390d775ceb1206dd0fed111a17896 (diff) | |
| parent | 0e2f415adf5d8c0e8bbb210c3c2693315854718f (diff) | |
| download | ffmpeg-f48d1fb167202cb1ccef29e067436024e7068792.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.6' into release/0.6
* qatar/release/0.6:
vorbis: Validate that the floor 1 X values contain no duplicates.
lavfi: avfilter_merge_formats: handle case where inputs are same
mpegvideo: Don't use ff_mspel_motion() for vc1
imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt
nuv: check RTjpeg header for validity
vc1dec: add flush function for WMV9 and VC-1 decoders
mov: set AVCodecContext.width/height for h264
h264: allow cropping to AVCodecContext.width/height
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cinepak.c')
0 files changed, 0 insertions, 0 deletions