Michael Niedermayer
86602d1c79
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vp6: Reset the internal state when aborting key frames header parsing
vp56: Release old pictures after a resolution changes
vp6: Check for huffman tree build errors
vp56: Check for missing reference frame data
cinepak: Fix invalid read access on extra data
vmd: fix segfaults on corruped streams
cook: Fix js_vlc_bits value validation for joint stereo
segafilm: Check for memory allocation failures in segafilm demuxer.
segafilm: Fix potential division by 0 on corrupted streams in the demuxer
Fixed segfault on corrupted sega streams in the demuxer.
Fixed deference of NULL pointer in motionpixels decoder.
libx264: support 9- and 10-bit output.
h264: correct implicit_weight for field-interlaced pictures.
mpegvideo: set correct offset for edge emulation buffer.
mpegvideo: fix position of bottom edge.
Conflicts:
libavcodec/motionpixels.c
libavcodec/mpegvideo.c
libavcodec/version.h
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Marton Balint
177ed7e818
swresample: use av_get_default_channel_layout instead of guess_layout
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Marton Balint
cbfca6225a
avutil: bump minor version because of av_get_default_channel_layout type fix
Well, probably an ABI breakage at least for 32bit, but hopefully it will go
unnoticed because the fix happened realtively soon.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Marton Balint
d2ba604421
audioconvert: fix type of av_get_default_channel_layout
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Michael Niedermayer
b93cb8383f
lavc: add ff_init_buffer_info()
Fixes seeking per fileposition in ffplay.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Laurent Aimar
5ec55d216e
h264: reject unsupported 422 9 bit streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Marton Balint
9bf4371e1b
audioconvert: make 7POINT1 channel layout the default for 8 channels
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Laurent Aimar
e588a5c2d4
h264: fix the size of PPS::chroma_qp_table
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Laurent Aimar
a72cad0a6c
vp6: Reset the internal state when aborting key frames header parsing
It prevents leaving the state only half initialized.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
14 years ago
Laurent Aimar
3d09d0017d
vp56: Release old pictures after a resolution changes
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
14 years ago
Laurent Aimar
066fff755a
vp6: Check for huffman tree build errors
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
14 years ago
Laurent Aimar
0ec6d6e9b6
vp56: Check for missing reference frame data
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
14 years ago
Laurent Aimar
d239d4b447
cinepak: Fix invalid read access on extra data
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
14 years ago
Laurent Aimar
c0cbe36b18
vmd: fix segfaults on corruped streams
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
14 years ago
Laurent Aimar
3a742470a8
cook: Fix js_vlc_bits value validation for joint stereo
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
14 years ago
Laurent Aimar
1775b92fee
segafilm: Check for memory allocation failures in segafilm demuxer.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
14 years ago
Laurent Aimar
762ffa6861
segafilm: Fix potential division by 0 on corrupted streams in the demuxer
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
14 years ago
Michael Niedermayer
a3ba542af3
h264: fix fill_colmap() to not store entries mbaff style when the reference is not mbaff at all
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Laurent Aimar
790f4dd5c9
Fixed segfault on corrupted sega streams in the demuxer.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
14 years ago
Laurent Aimar
69a0bce753
Fixed deference of NULL pointer in motionpixels decoder.
Some of the arguments given to init_vlc() come from the stream
and can be corrupted.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
14 years ago
Michael Niedermayer
481747c6f7
ffmpeg: make -a/v/sn work with -map
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Michael Niedermayer
f7fbbf466f
lavf/utils: document AVIndexEntry.timestamp
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Michael Niedermayer
67b2df792f
swresample: Try to handle cases with input channel count and layout mismatching.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Clément Bœsch
696a780c47
bintext: fix warning message wording.
14 years ago
Gwenole Beauchesne
825dd135d8
vaapi: fix VC-1 decoding (reconstruct bitstream TTFRM correctly).
14 years ago
Michael Niedermayer
955113e31b
mpegps: drop incorrect line of sofdec detection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Michael Niedermayer
5bebb6e64b
mpeg1dec: More complete sofdec support
Fixes Ticket517
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Anton Khirnov
d97efd7f87
libx264: support 9- and 10-bit output.
14 years ago
Clément Bœsch
1b3b4a575b
libmodplug: free file content buffer in read_close() callback.
14 years ago
Clément Bœsch
8830c4e8a9
libmodplug: add TODO entry for probing.
14 years ago
Clément Bœsch
c768e96668
libmodplug: add metadata support.
14 years ago
Clément Bœsch
e6f937237a
libmodplug: add an option to enlarge the max supported file size.
14 years ago
Clément Bœsch
a763b46298
libmodplug: support options (noise reduction, reverb, bass boost, ...)
14 years ago
Michael Niedermayer
6638207bce
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Fix 'heigth' vs. 'height' typos.
lavc/lavf: use unique private classes.
lavc: use designated initializers for av_codec_context_class
Conflicts:
libavdevice/fbdev.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Nicolas George
2c1c0c5024
ffmpeg: fix forced key frames.
Now that the option was moved in the per-stream context,
the parsing is done before the time_base for the stream is decided.
This patch does the parsing in AV_TIME_BASE units and rescales the
timestamps later when the correct time base is known.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Michael Niedermayer
714517b26a
flvenc: Ignore metadata that has special values and is stored already based on
more correct values.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Michael Niedermayer
9fa05db400
swr-docs: update due to last change to swresample
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Michael Niedermayer
503e5e9db5
libswresample: support directly converting sampleformats and packed/planar in a single pass.
Previously a intermediate planar format was used when both input and output where packed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Michael Niedermayer
63b6d5f33f
update_stream_timings: Remove redundant check.
Found-by:Nicolas
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Clément Bœsch
d7366d918f
libmodplug: handle EOF correctly.
14 years ago
Carl Eugen Hoyos
d9b6068764
Use WMAv2 as default audio codec for asf.
14 years ago
Carl Eugen Hoyos
3bcbd8c5c7
Use M4S2 as default video tag for MPEG-4 ASP in asf.
14 years ago
Clément Bœsch
9a2ceee2e3
libmodplug: simplify and fix read_packet() callback.
In case of av_new_packet() error, a correct return error code is raised,
the data memcpy is avoided, and pkt dts/pts are not assigned anymore
(since the defaults are good).
14 years ago
Clément Bœsch
5420885737
libmodplug: consistent use of sizeof.
14 years ago
Michael Niedermayer
f9bd979476
generic seeking: fail if there are 1000 non keyframes found with no keyframe.
This avoids scanning through a whole file just to fail.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Ronald S. Bultje
4418aa9cb3
h264: correct implicit_weight for field-interlaced pictures.
14 years ago
Ronald S. Bultje
330deb7592
mpegvideo: set correct offset for edge emulation buffer.
Using the old code, half of it was unused and the other half was too
small for e.g. >8bpp interlaced data, causing random buffer overruns.
14 years ago
Ronald S. Bultje
0884dd5a1b
mpegvideo: fix position of bottom edge.
It was wrong in colorspaces where horizontal and vertical chroma
subsampling are not the same, e.g. 422.
14 years ago
Diego Biurrun
e83c2ddebf
Fix 'heigth' vs. 'height' typos.
14 years ago
Anton Khirnov
a4ea00d021
lavc/lavf: use unique private classes.
This is needed by the new AVOptions API.
14 years ago