Michael Niedermayer
63d2cfd142
dvdec: Fix dvsd profile[1] detection.
...
Fixes Ticket159
If someone knows of a cleaner way to detect this, patch is welcome.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-02 05:21:25 +02:00
Michael Niedermayer
fea20d1ddc
Revert "mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested"
...
This broke mplayer
This reverts commit a18e04bcf9
.
2011-09-02 01:18:22 +02:00
Michael Niedermayer
94c2478d90
jpegdec: better rst skiping
...
Fixes Ticket426
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-02 01:09:39 +02:00
Reimar Döffinger
5e2ea138b7
MJPEG: emulate EOI also on two consecutive SOI.
...
Fixes issue #362 .
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-09-01 22:54:35 +02:00
Reimar Döffinger
55a1fe7a80
Reset cur_scan at more appropriate places.
...
Reset it when we actually process an EOI, not when we actually
decide to ignore it for bug-workarounds, and reset it on
SOF to make it more reliable in case of missing EOI.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-09-01 22:54:35 +02:00
Michael Niedermayer
58677d73ed
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avconv: fix some bugs introduced in 630902a1e1
libmp3lame: fix typo
AVOptions: drop av_ prefix from static av_get_number().
libx264: use X264_THREADS_AUTO constant instead of 0.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-01 22:08:44 +02:00
Clément Bœsch
acc3c380cb
resample: fix typo (ouput → output).
2011-09-01 20:25:32 +02:00
Clément Bœsch
b85e9d3104
resample: fix set but unused variable (lfe) warning.
2011-09-01 20:23:40 +02:00
Clément Bœsch
f067d8a618
imgconvert: avoid mixed declarations and code.
2011-09-01 20:23:40 +02:00
Gavin Kinsey
2f870e262e
jpegdec: set color_range
2011-09-01 16:18:22 +02:00
Anton Khirnov
9bc9188e58
libmp3lame: fix typo
...
FF_API_LAME_GLOBAL_OPTIONS => FF_API_LAME_GLOBAL_OPTS
Thanks to Clément Bœsch for spotting.
2011-09-01 10:37:19 +02:00
Anton Khirnov
1440037411
libx264: use X264_THREADS_AUTO constant instead of 0.
2011-09-01 10:12:30 +02:00
Michael Niedermayer
a538e0f9a0
vc1: loose one line difference to qatar.
...
This should make no functional difference.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-01 02:38:56 +02:00
Michael Niedermayer
f5bda9fcbb
mpeg4: fix typo in mpeg4_encode_gop_header()
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-01 02:22:36 +02:00
Diego Biurrun
aebb56e184
Replace some commented-out debug printf() / av_log() messages with av_dlog().
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-01 01:31:03 +02:00
Michael Niedermayer
0ed7bc49a3
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (31 commits)
libx264: set default thread count to 0 (auto)
lavc: cosmetics, group deprecated codec flags
mpeg12: add 'scan_offset' private option.
h263/p encoder: add 'structured_slices' private option.
h263/p encoder: add 'obmc' private option.
h263p encoder: add 'aiv' private option.
h263p encoder: add 'umv' private option.
mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option.
mjpegdec: add 'extern_huff' private option.
mpeg4enc: add 'data_partitioning' private option.
snow: add 'memc_only' private option.
libx264: add 'mbtree' private option.
libx264: add 'psy' private option.
libmp3lame: add 'reservoir' private option.
mpeg2enc: add 'non_linear_quant' private option
mpeg12enc: add drop_frame_timecode private option.
mpeg12enc: add intra_vlc private option.
VC1: Support dynamic dimension changes
mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested
lavc: deprecate CODEC_FLAG2_BRDO
...
Conflicts:
avconv.c
libavcodec/libmp3lame.c
libavcodec/libx264.c
libavcodec/mjpegdec.c
libavcodec/mpeg12enc.c
libavcodec/mpegvideo.h
libavcodec/vc1.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-01 00:01:21 +02:00
Anton Khirnov
5d06f15235
libx264: set default thread count to 0 (auto)
2011-08-31 17:39:13 +02:00
Anton Khirnov
f013cb8118
lavc: cosmetics, group deprecated codec flags
2011-08-31 13:28:54 +02:00
Anton Khirnov
aed7900704
mpeg12: add 'scan_offset' private option.
...
Deprecate CODEC_FLAG_SVCD_SCAN_OFFSET
2011-08-31 13:28:41 +02:00
Anton Khirnov
4bcee8e7f8
h263/p encoder: add 'structured_slices' private option.
...
Deprecate CODEC_FLAG_H263P_SLICE_STRUCT
2011-08-31 13:28:26 +02:00
Anton Khirnov
0d904de89d
h263/p encoder: add 'obmc' private option.
...
Deprecate CODEC_FLAG_OBMC
2011-08-31 13:28:11 +02:00
Anton Khirnov
e3922d1110
h263p encoder: add 'aiv' private option.
...
Deprecate CODEC_FLAG_H263P_AIV
2011-08-31 13:27:59 +02:00
Anton Khirnov
9bb2d1a3f0
h263p encoder: add 'umv' private option.
...
Deprecate CODEC_FLAG_H263P_UMV
2011-08-31 13:27:36 +02:00
Anton Khirnov
0e5d37309f
mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option.
...
Deprecate CODEC_FLAG_ALT_SCAN
2011-08-31 13:26:26 +02:00
Anton Khirnov
1f0c7020a1
mjpegdec: add 'extern_huff' private option.
...
Deprecate CODEC_FLAG_EXTERN_HUFF
2011-08-31 13:25:54 +02:00
Anton Khirnov
4623420d84
mpeg4enc: add 'data_partitioning' private option.
...
Deprecate CODEC_FLAG_PART
2011-08-31 13:25:18 +02:00
Anton Khirnov
0cc06b9e23
snow: add 'memc_only' private option.
...
Deprecate CODEC_FLAG2_MEMC_ONLY
2011-08-31 13:24:16 +02:00
Anton Khirnov
0dc5e12f1e
libx264: add 'mbtree' private option.
...
Deprecate CODEC_FLAG2_MBTREE
2011-08-31 13:24:02 +02:00
Anton Khirnov
38934f19fe
libx264: add 'psy' private option.
...
Deprecate CODEC_FLAG2_PSY
2011-08-31 13:23:37 +02:00
Anton Khirnov
a7cec3a094
libmp3lame: add 'reservoir' private option.
...
Deprecate CODEC_FLAG2_BIT_RESERVOIR
2011-08-31 13:22:53 +02:00
Anton Khirnov
88262ca87d
mpeg2enc: add 'non_linear_quant' private option
...
Deprecate CODEC_FLAG2_NON_LINEAR_QUANT
2011-08-31 13:21:59 +02:00
Anton Khirnov
2c5e1efc09
mpeg12enc: add drop_frame_timecode private option.
...
Deprecate CODEC_FLAG2_DROP_FRAME_TIMECODE
2011-08-31 13:21:05 +02:00
Anton Khirnov
297d9cb3dc
mpeg12enc: add intra_vlc private option.
...
Deprecate CODEC_FLAG2_INTRA_VLC.
2011-08-31 13:19:14 +02:00
Alberto Delmás
d2f119a1f2
VC1: Support dynamic dimension changes
...
Fixes SA00072, SA00073, SA10150, SA10151, Issue2076
Improves SA10153
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-08-31 13:11:23 +02:00
Dustin Brody
a18e04bcf9
mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-08-31 10:28:29 +02:00
Anton Khirnov
7485e54708
lavc: deprecate CODEC_FLAG2_BRDO
...
It's been unused for the last 3 years.
2011-08-31 10:26:21 +02:00
Anton Khirnov
cf90c5d0e0
libx264: add 'aud' private option.
...
Deprecate CODEC_FLAG2_AUD.
2011-08-31 10:26:11 +02:00
Anton Khirnov
3b82aeeec0
libx264: add 'fast-pskip' private option.
...
Deprecate CODEC_FLAG2_FASTPSKIP.
2011-08-31 10:25:54 +02:00
Anton Khirnov
373257fa79
libx264: add '8x8dct' private option.
...
Deprecate CODEC_FLAG2_8X8DCT.
2011-08-31 10:25:34 +02:00
Anton Khirnov
eab21c32e3
libx264: add 'mixed-refs' private option.
...
Deprecate CODEC_FLAG2_MIXED_REFS.
2011-08-31 10:25:06 +02:00
Anton Khirnov
0f29699db7
libx264: add 'weightb' private option.
...
Deprecate CODEC_FLAG2_BPYRAMID.
2011-08-31 10:24:56 +02:00
Anton Khirnov
34dda1251d
libx264: add 'b-pyramid' private option.
...
Deprecate CODEC_FLAG2_BPYRAMID.
2011-08-31 10:24:17 +02:00
Anton Khirnov
5d4a1048ee
libx264: add 'intra-refresh' private option.
...
Deprecate CODEC_FLAG2_INTRA_REFRESH.
2011-08-31 10:23:26 +02:00
Anton Khirnov
faaecd4708
libx264: add 'ssim' private option.
...
Deprecate CODEC_FLAG2_SSIM.
2011-08-31 10:23:03 +02:00
Anton Khirnov
3b81636f33
libx264: make options compatible with x264
...
Replace '_' with '-', merge psy-trellis into psy-rd and rename cqp->qp
Also fix typo pdy-rd -> psy-rd
2011-08-31 10:21:36 +02:00
Luca Barbato
dde372934a
avcodec: remove misleading comment
...
coded_width is the width before lowres scaling,
coded_height is the height before lowres scaling.
2011-08-31 09:57:46 +02:00
Michael Niedermayer
66ce282df5
h264: clean all non null elements of delayed_pic[]
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-31 05:04:14 +02:00
Michael Niedermayer
b955ab2f49
h264: change MAX_DELAYED_PIC_COUNT check to av_assert0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-31 05:00:39 +02:00
Michael Niedermayer
76ba894eab
Merge commit 'f593628e5868e52a46de666767896c6afcebdae4'
...
* commit 'f593628e5868e52a46de666767896c6afcebdae4':
avconv: Replace raw picture frame swapping hack.
RV40: reuse some H.264 motion compensation functions in RV40.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-31 00:12:05 +02:00
Kostya Shishkov
a80852316e
RV40: reuse some H.264 motion compensation functions in RV40.
...
Since RV40 is based on H.264, it uses the same interpolation filters and
functions for halfpel interpolation in one direction can be reused.
Unfortunately other cases are implemented differently and produce slightly
different output because of rounding.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-08-30 12:04:46 +01:00