aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/swscale_unscaled.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-06-22 05:16:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-06-22 05:16:40 +0200
commit043d2affbbc124c6d802fe2989d9b1ed73825368 (patch)
tree5cf6ebba7a816fe0475cee59e9e946d726940607 /libswscale/swscale_unscaled.c
parent86824c1dcb3eaffc2b143de452e8082dc3c59822 (diff)
parent67e7dc54049d9b51a0c2168c8265145a9aef7780 (diff)
downloadffmpeg-043d2affbbc124c6d802fe2989d9b1ed73825368.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: rawdec: Fix decoding of QT WRAW files. configure: report optimization for size separately mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers. mov: Support R10g codec identifier. riff/img2: Add JPEG 2000 codec IDs. riff: Add DAVC fourcc. riff: Add M263, XVIX, MMJP, CDV5 fourccs. rawvideo: Support auv2 fourcc. swscale: Remove unused variable from ff_bfin_get_unscaled_swscale(). h264: Fix assert that failed to compile with -DDEBUG. h264: Add x86 assembly for 10-bit weight/biweight H.264 functions. fate: remove output redirections from old regtest scripts Conflicts: configure libavcodec/rawdec.c libavformat/isom.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_unscaled.c')
0 files changed, 0 insertions, 0 deletions