summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) fix AC3ENC_OPT_MODE_ON/OFF h264: fix HRD parameters parsing prores: implement multithreading. prores: idct sse2/sse4 optimizations. swscale: use aligned move for storage into temporary buffer. prores: extract idct into its own dspcontext and merge with put_pixels. h264: fix invalid shifts in init_cavlc_level_tab() intfloat_readwrite: fix signed addition overflows mov: do not misreport empty stts mov: cosmetics, fix for and if spacing id3v2: fix NULL pointer dereference mov: read album_artist atom mov: fix disc/track numbers and totals doc: fix references to obsolete presets directories for avconv/ffmpeg flashsv: return more meaningful error value flashsv: fix typo in av_log() message smacker: validate channels and sample format. smacker: check buffer size before reading output size smacker: validate number of channels smacker: Separate audio flags from sample rates in smacker demuxer. ... Conflicts: cmdutils.h doc/ffmpeg.texi libavcodec/Makefile libavcodec/motion_est_template.c libavformat/id3v2.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: do not misreport empty sttsLuca Barbato2011-10-11
| | | | | | | | | | Return -1 instead of ENOMEM if entries is 0. Fixes a av_malloc(0) crash in macosx.
| * mov: cosmetics, fix for and if spacingLuca Barbato2011-10-11
| |
| * id3v2: fix NULL pointer dereferenceAnton Khirnov2011-10-11
| | | | | | | | Bug found by Laurent Aimar fenrir at videolan org
| * mov: read album_artist atomRaivo Hool2011-10-11
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mov: fix disc/track numbers and totalsRaivo Hool2011-10-11
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * smacker: Separate audio flags from sample rates in smacker demuxer.Justin Ruggles2011-10-11
| | | | | | | | Makes the code easier to understand.
* | cdg: enable seekingMichael Niedermayer2011-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cdg: Try to detect keyframes.Michael Niedermayer2011-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cdg: set timestampsMichael Niedermayer2011-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: check stream_index from read_packet() for validity.Michael Niedermayer2011-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (34 commits) h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering() error_resilience: fix the check for missing references in ff_er_frame_end() for H264 4xm: prevent NULL dereference with invalid huffman table 4xmdemux: prevent use of uninitialized memory 4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers ptx: check for out of bound reads tiffdec: fix out of bound reads/writes eacmv: check for out of bound reads eacmv: fix potential pointer arithmetic overflows adpcm: fix out of bound reads due to integer overflow anm: prevent infinite loop avsdemux: check for out of bound writes avs: check for out of bound reads avsdemux: check for corrupted data AVOptions: refactor set_number/write_number AVOptions: cosmetics, rename static av_set_number2() to write_number(). AVOptions: cosmetics, move and rename static av_set_number(). AVOptions: split av_set_string3 into opt type-specific functions avidec: fix signed overflow in avi_sync() mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions. ... Conflicts: Changelog configure libavcodec/ptx.c libavcodec/ra144.c libavcodec/vaapi_vc1.c libavcodec/vc1.c libavcodec/version.h libavformat/4xm.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 4xmdemux: prevent use of uninitialized memoryLaurent Aimar2011-10-10
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * avsdemux: check for out of bound writesLaurent Aimar2011-10-10
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * avsdemux: check for corrupted dataLaurent Aimar2011-10-10
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * avidec: fix signed overflow in avi_sync()Mans Rullgard2011-10-10
| | | | | | | | | | | | | | | | Keeping byte values read from the file as unsigned is consistent with how they are subsequently used and avoids an undefined left shift by 24 when bit 7 is set. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related ↵Alex Converse2011-10-10
| | | | | | | | functions.
| * avidec: simplify size parameter in memset()Janne Grunau2011-10-10
| |
* | libmodplug: do not call av_expr_parse() in case of no expr specified.Clément Bœsch2011-10-10
| |
* | libmodplug: simpler and faster use of eval expr.Clément Bœsch2011-10-10
| |
* | mxfdec: Move FooterPartition to MXFContext and make sure it's never set to zeroTomas Härdin2011-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support playing SMV files.Reimar Döffinger2011-10-10
| | | | | | | | | | | | | | | | | | | | | | | | Audio and video are interleaved via stream cur_dts - no idea how reliable this is. It also cannot display the video properly - it is stored with about 15 in a single JPEG frame, I cannot think of a reasonable way to implement this. Samples: http://samples.mplayerhq.hu/smv/ Format description: http://wiki.multimedia.cx/index.php?title=SMV Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | libmodplug: add bintext video stream capability.Clément Bœsch2011-10-10
| |
* | mpegts: reduce av_log level for seek back to begin on unseekable protocols ↵Michael Niedermayer2011-10-10
| | | | | | | | | | | | to info level. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: Attempt to seek back to beginning in non-seekable mpegts files.Petter Ericson2011-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Bump minor for G.723.1 encoder and muxer.Carl Eugen Hoyos2011-10-10
| |
* | g723.1 muxerMohamed Naufal2011-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not auto-detect Sorenson Spark in f4v.Carl Eugen Hoyos2011-10-09
| | | | | | | | Assuming codec_tag H263 for FLV only leads to trouble.
* | Be less verbose about continuity check errors.Carl Eugen Hoyos2011-10-09
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: fix signed overflow in avformat_find_stream_info() vp8: fix signed overflows motion_est: fix some signed overflows dca: fix signed overflow in shift aacdec: fix undefined shifts bink: Check for various out of bound writes bink: Check for out of bound writes when building tree put_bits: fix invalid shift by 32 in flush_put_bits() Conflicts: libavcodec/bink.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: fix signed overflow in avformat_find_stream_info()Mans Rullgard2011-10-08
| | | | | | | | | | | | | | | | | | | | On the first iteration through this code, last_dts is always INT64_MIN (AV_NOPTS_VALUE) and the subtraction overflows in an invalid manner. Although the result is only used if the input values are valid, performing the subtraction is still not allowed in a strict environment. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | vqa: fix double free on corrupted streamsLaurent Aimar2011-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (24 commits) mpegps: Use av_get_packet() instead of poorly emulating it. motionpixels: decode only the 111 complete frames for fate mpc8: Check out of bound bands limit xan: Prevent NULL dereference with missing palette xan: Check for out of bound reads in xan_huffman_decode() xan: Fixed out of bound accesses in xan_unpack() motionpixels: Prevent calling init_vlc() with invalid parameters shorten: Fix out of bound writes in fix_bitshift() dsicinav: Check for out of bounds writes tiertexseqv: Check for out of bound reads quickdraw: Check for out of bound reads dsicinav: Check for out of bounds reads motionpixels: Fix the size of workspace buffers motionpixels: Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer wmavoice: Check for corrupted extra data wmavoice: Check for out of bound writes xan: Prevent NULL dereferences with missing reference frame bink: Prevent NULL dereferences with missing reference frame wavpack: Reset internal state on corrupted blocks wmapro: Validate the number of audio channels before using it ... Conflicts: libavcodec/h264.c libavcodec/xan.c tests/ref/fate/motionpixels Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegps: Use av_get_packet() instead of poorly emulating it.Alex Converse2011-10-07
| |
| * mpc8: Fix return value on EOFLaurent Aimar2011-10-07
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * segafilm: Check for memory allocation failures in segafilm demuxer.Laurent Aimar2011-10-06
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * segafilm: Fix potential division by 0 on corrupted streams in the demuxerLaurent Aimar2011-10-06
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * Fixed segfault on corrupted sega streams in the demuxer.Laurent Aimar2011-10-06
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | return error code if error happensMaksym Veremeyenko2011-10-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/utils: document AVIndexEntry.timestampMichael Niedermayer2011-10-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegps: drop incorrect line of sofdec detectionMichael Niedermayer2011-10-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libmodplug: free file content buffer in read_close() callback.Clément Bœsch2011-10-06
| |
* | libmodplug: add TODO entry for probing.Clément Bœsch2011-10-06
| |
* | libmodplug: add metadata support.Clément Bœsch2011-10-06
| |
* | libmodplug: add an option to enlarge the max supported file size.Clément Bœsch2011-10-06
| |
* | libmodplug: support options (noise reduction, reverb, bass boost, ...)Clément Bœsch2011-10-06
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-06
|\| | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc/lavf: use unique private classes.Anton Khirnov2011-10-05
| | | | | | | | This is needed by the new AVOptions API.
* | flvenc: Ignore metadata that has special values and is stored already based onMichael Niedermayer2011-10-06
| | | | | | | | | | | | more correct values. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | update_stream_timings: Remove redundant check.Michael Niedermayer2011-10-06
| | | | | | | | | | Found-by:Nicolas Signed-off-by: Michael Niedermayer <michaelni@gmx.at>