diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-21 16:17:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-21 16:17:13 +0200 |
| commit | 50df56161f42da21a455204b76e17148ac3d9659 (patch) | |
| tree | ad524d8438b0dc82e7da4bf1aa124024fdcee971 /libavcodec/x86/h264_qpel_mmx.c | |
| parent | 26ec392a0e30409fbb0738a5173a9b71a9c99df0 (diff) | |
| parent | 72e8d86b19c605f2173b20e56cbc42e032572e08 (diff) | |
| download | ffmpeg-50df56161f42da21a455204b76e17148ac3d9659.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dirac: use meaningful return values
flacdec: simplify sample buffer handling
flacdec: simplify loop in decode_residuals()
fate: make Ut Video encoder tests use bitexact swscale flags
build: amrwb: Drop redundant lsp dependency declaration
fate: fix utvideoenc tests
Conflicts:
libavcodec/dirac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_qpel_mmx.c')
0 files changed, 0 insertions, 0 deletions