diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 15:21:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 15:54:36 +0100 |
| commit | 002ad7cd3901fe6e022f5f542d36e327bdbd7f50 (patch) | |
| tree | 63341faa2457aa8a694ff4b5f11b7ac06e1f90cb /libavcodec/jpeglsdec.h | |
| parent | 397fafad230a7d4f2d2c0908ae56418318e82148 (diff) | |
| parent | 0a837b631757a7407df038248eea5e9e79b1cb79 (diff) | |
| download | ffmpeg-002ad7cd3901fe6e022f5f542d36e327bdbd7f50.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
fate: update ref after rv30_loop_filter fix
rv30: fix masking in rv30_loop_filter()
libcdio: support recent cdio-paranoia
theora: Skip zero-sized headers
h264: add 3 pixels below for subpixel filter wait position
h264: fix ff_generate_sliding_window_mmcos() prototype.
h264: don't clobber mmco opcode tables for non-first slice headers.
Conflicts:
configure
libavcodec/h264_refs.c
tests/ref/fate/filter-delogo
tests/ref/fate/rv30
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsdec.h')
0 files changed, 0 insertions, 0 deletions