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>
14 years ago
Clément Bœsch
acc3c380cb
resample: fix typo (ouput → output).
14 years ago
Clément Bœsch
f738388bba
Makefile: remove unused PROGS_G.
14 years ago
Clément Bœsch
33d9077001
build: introduce --progs-suffix option.
14 years ago
Clément Bœsch
3dd2c8bbbc
wav: init st to NULL to avoid a false-positive warning.
...
If st is NULL, it means no 'fmt ' tag is found, but 'data' tag (which
needs a previous 'fmt ' tag to be parsed correctly and st initialized)
check will make sure st is never dereferenced in that case.
14 years ago
Clément Bœsch
0baf651bc1
cmdutils: fix uninitialized variable (type) warning.
14 years ago
Clément Bœsch
7c14c24250
sws: fix a huge amount of incompatible pointer type arguments warnings.
14 years ago
Clément Bœsch
df8737eb35
ffmpeg: fix two unused variables warnings.
14 years ago
Clément Bœsch
b85e9d3104
resample: fix set but unused variable (lfe) warning.
14 years ago
Clément Bœsch
f067d8a618
imgconvert: avoid mixed declarations and code.
14 years ago
Carl Eugen Hoyos
c0e8bce349
Fix compilation with --disable-avfilter.
...
Fixes ticket #425 .
14 years ago
Gavin Kinsey
2f870e262e
jpegdec: set color_range
14 years ago
Michael Niedermayer
6248694861
avconv: fix some bugs introduced in 630902a1e1
...
These caused scrambled error messages to be printed and
floating point exceptions.
For example when there was no decoder available for a
stream.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Anton Khirnov
9bc9188e58
libmp3lame: fix typo
...
FF_API_LAME_GLOBAL_OPTIONS => FF_API_LAME_GLOBAL_OPTS
Thanks to Clément Bœsch for spotting.
14 years ago
Anton Khirnov
bea5670a4f
AVOptions: drop av_ prefix from static av_get_number().
14 years ago
Anton Khirnov
1440037411
libx264: use X264_THREADS_AUTO constant instead of 0.
14 years ago
Michael Niedermayer
3584b01e4e
ffmpeg: Fix typos introduced in:
...
commit 630902a1e1
Author: Anton Khirnov <anton@khirnov.net>
Date: Wed Jul 6 08:49:07 2011 +0200
avconv: factor out initializing input streams.
These caused scrambled error messages to be printed and
floating point exceptions.
For example when there was no decoder available for a
stream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Michael Niedermayer
a538e0f9a0
vc1: loose one line difference to qatar.
...
This should make no functional difference.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Michael Niedermayer
f5bda9fcbb
mpeg4: fix typo in mpeg4_encode_gop_header()
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Diego Biurrun
aebb56e184
Replace some commented-out debug printf() / av_log() messages with av_dlog().
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Michael Niedermayer
8c6fde8c17
APIchanges: remove "deprecate url_feof"
...
url_feof() is usefull when a file is appended to
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
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>
14 years ago
Anton Khirnov
5d06f15235
libx264: set default thread count to 0 (auto)
14 years ago
Stefano Sabatini
a9c69362ea
vsink_buffer: fix void pointer dereference in av_vsink_buffer_get_video_buffer_ref()
14 years ago
Stefano Sabatini
6da590d0a5
lavdev/lavfi: add debug traces in lavfi_read_packet()
14 years ago
Stefano Sabatini
22ee131e85
vf_yadif: add support to yuva420p
14 years ago
Anton Khirnov
f013cb8118
lavc: cosmetics, group deprecated codec flags
14 years ago
Anton Khirnov
aed7900704
mpeg12: add 'scan_offset' private option.
...
Deprecate CODEC_FLAG_SVCD_SCAN_OFFSET
14 years ago
Anton Khirnov
4bcee8e7f8
h263/p encoder: add 'structured_slices' private option.
...
Deprecate CODEC_FLAG_H263P_SLICE_STRUCT
14 years ago
Anton Khirnov
0d904de89d
h263/p encoder: add 'obmc' private option.
...
Deprecate CODEC_FLAG_OBMC
14 years ago
Anton Khirnov
e3922d1110
h263p encoder: add 'aiv' private option.
...
Deprecate CODEC_FLAG_H263P_AIV
14 years ago
Anton Khirnov
9bb2d1a3f0
h263p encoder: add 'umv' private option.
...
Deprecate CODEC_FLAG_H263P_UMV
14 years ago
Anton Khirnov
0e5d37309f
mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option.
...
Deprecate CODEC_FLAG_ALT_SCAN
14 years ago
Anton Khirnov
1f0c7020a1
mjpegdec: add 'extern_huff' private option.
...
Deprecate CODEC_FLAG_EXTERN_HUFF
14 years ago
Anton Khirnov
4623420d84
mpeg4enc: add 'data_partitioning' private option.
...
Deprecate CODEC_FLAG_PART
14 years ago
Anton Khirnov
0cc06b9e23
snow: add 'memc_only' private option.
...
Deprecate CODEC_FLAG2_MEMC_ONLY
14 years ago
Anton Khirnov
0dc5e12f1e
libx264: add 'mbtree' private option.
...
Deprecate CODEC_FLAG2_MBTREE
14 years ago
Anton Khirnov
38934f19fe
libx264: add 'psy' private option.
...
Deprecate CODEC_FLAG2_PSY
14 years ago
Anton Khirnov
a7cec3a094
libmp3lame: add 'reservoir' private option.
...
Deprecate CODEC_FLAG2_BIT_RESERVOIR
14 years ago
Anton Khirnov
88262ca87d
mpeg2enc: add 'non_linear_quant' private option
...
Deprecate CODEC_FLAG2_NON_LINEAR_QUANT
14 years ago
Anton Khirnov
2c5e1efc09
mpeg12enc: add drop_frame_timecode private option.
...
Deprecate CODEC_FLAG2_DROP_FRAME_TIMECODE
14 years ago
Anton Khirnov
297d9cb3dc
mpeg12enc: add intra_vlc private option.
...
Deprecate CODEC_FLAG2_INTRA_VLC.
14 years ago
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>
14 years ago
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>
14 years ago
Anton Khirnov
7485e54708
lavc: deprecate CODEC_FLAG2_BRDO
...
It's been unused for the last 3 years.
14 years ago
Anton Khirnov
cf90c5d0e0
libx264: add 'aud' private option.
...
Deprecate CODEC_FLAG2_AUD.
14 years ago
Anton Khirnov
3b82aeeec0
libx264: add 'fast-pskip' private option.
...
Deprecate CODEC_FLAG2_FASTPSKIP.
14 years ago
Anton Khirnov
373257fa79
libx264: add '8x8dct' private option.
...
Deprecate CODEC_FLAG2_8X8DCT.
14 years ago
Anton Khirnov
eab21c32e3
libx264: add 'mixed-refs' private option.
...
Deprecate CODEC_FLAG2_MIXED_REFS.
14 years ago
Anton Khirnov
0f29699db7
libx264: add 'weightb' private option.
...
Deprecate CODEC_FLAG2_BPYRAMID.
14 years ago