diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-10 03:54:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-10 04:47:23 +0200 |
| commit | 2ec77aae6791582b2f8e2502b48fd6d562aa81ce (patch) | |
| tree | 8e8dfb93cd03ee5b3259c7e068454f7d2b04fb6f /mt-work | |
| parent | 6a137dde3ed6d88dc8bfa9de6f29a23e2b384a77 (diff) | |
| parent | 996bbdbf1f5a031d38e8af3eac432bf8e2c72458 (diff) | |
| download | ffmpeg-2ec77aae6791582b2f8e2502b48fd6d562aa81ce.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: make compute_pkt_fields2() return meaningful error values
matroskadec: set timestamps for RealAudio packets.
intelh263dec: aspect ratio processing fix.
intelh263dec: fix "Strict H.263 compliance" file playback
oss,sndio: simplify by using FFMIN.
swscale: extract monowhite/black output from yuv2packed[12X]_c().
swscale: de-macro'ify RGB15/16/32 input functions.
swscale: rearrange code.
movdec: Add support for the 'wfex' atom.
ffmpeg.c: Add a necessary const qualifier
riff: Fix potential memleak.
swscale: change 48bit RGB input macros to inline functions.
swscale: change 9/10bit YUV input macros to inline functions.
swscale: extract gray16 output functions from yuv2packed[12X]().
swscale: use standard clipping functions.
swscale: merge macros that are used only once.
swscale: fix function declarations in swscale.c.
swscale: fix function declaration keywords in x86/swscale_template.c.
Conflicts:
ffmpeg.c
libavcodec/intelh263dec.c
libswscale/swscale.c
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'mt-work')
0 files changed, 0 insertions, 0 deletions