summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Fixes wrong duration in .mov file. Issue 599Oana Stratulat2012-01-11
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) rv34: frame-level multi-threading mpegvideo: claim ownership of referenced pictures aacsbr: prevent out of bounds memcpy(). ipmovie: fix pts for CODEC_ID_INTERPLAY_DPCM sierravmd: fix audio pts bethsoftvideo: Use bytestream2 functions to prevent buffer overreads. bmpenc: support for PIX_FMT_RGB444 swscale: fix crash in fast_bilinear code when compiled with -mred-zone. swscale: specify register type. rv34: use get_bits_left() avconv: reinitialize the filtergraph on resolution change. vsrc_buffer: error on changing frame parameters. avconv: fix -copyinkf. fate: Update file checksums after the mov muxer change in a78dbada55d6 movenc: Don't store a nonzero creation time if nothing was set by the caller bmpdec: support for rgb444 with bitfields compression rgb2rgb: allow conversion for <15 bpp doc: fix stray reference to FFmpeg v4l2: use C99 struct initializer v4l2: poll the file descriptor ... Conflicts: avconv.c libavcodec/aacsbr.c libavcodec/bethsoftvideo.c libavcodec/kmvc.c libavdevice/v4l2.c libavfilter/vsrc_buffer.c libswscale/swscale_unscaled.c libswscale/x86/input.asm tests/ref/acodec/alac tests/ref/acodec/pcm_s16be tests/ref/acodec/pcm_s24be tests/ref/acodec/pcm_s32be tests/ref/acodec/pcm_s8 tests/ref/lavf/mov tests/ref/vsynth1/dnxhd_1080i tests/ref/vsynth1/mpeg4 tests/ref/vsynth1/qtrle tests/ref/vsynth1/svq1 tests/ref/vsynth2/dnxhd_1080i tests/ref/vsynth2/mpeg4 tests/ref/vsynth2/qtrle tests/ref/vsynth2/svq1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ipmovie: fix pts for CODEC_ID_INTERPLAY_DPCMJustin Ruggles2012-01-10
| | | | | | | | frame sample count calculation was incorrect
| * sierravmd: fix audio ptsJustin Ruggles2012-01-10
| | | | | | | | | | The duration of the first packet was being calculated incorrectly, leading to an incorrect timestamp offset.
| * movenc: Don't store a nonzero creation time if nothing was set by the callerMartin Storsjö2012-01-10
| | | | | | | | | | | | | | | | | | If the creation time is stored in the file as a zero, the mov demuxer skips exporting the creation time. Currently, files muxed without a creation time get demuxed with a Jan 1st 1970 creation timestamp. Signed-off-by: Martin Storsjö <martin@martin.st>
* | rawdec: use av_shrink_packet.Reimar Döffinger2012-01-09
| | | | | | | | | | | | | | This fixes reads of uninitialized data by the parser when running FATE sample h264-conformance/SL1_SVA_B.264. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | lavf: Add forgotten line from 212fd3a1f1121a9db20c478f1fccf15e8bb53c94Michael Niedermayer2012-01-09
| | | | | | | | | | | | This fixes a tiny memleak. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ipmovie: Fix passing resolution changes on.Michael Niedermayer2012-01-08
| | | | | | | | | | | | Fixes Ticket676 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) cabac: Move code only used within the CABAC test program into the test program. vp56: Drop unnecessary cabac.h #include. h264-test: Initialize AVCodecContext.av_class. build: Skip compiling network.h and rtsp.h if networking is not enabled. cosmetics: drop some pointless parentheses Disable annoying warning without changing behavior faq: Solutions for common problems with sample paths when running FATE. avcodec: attempt to clarify the CODEC_CAP_DELAY documentation avcodec: fix avcodec_encode_audio() documentation. FATE: xmv-demux test; exercise the XMV demuxer without decoding the perceptual codecs inside. vqf: recognize more metadata chunks FATE test: BMV demuxer and associated video and audio decoders. FATE: indeo4 video decoder test. FATE: update xxan-wc4 test to a sample with more code coverage. Change the recent h264_mp4toannexb bitstream filter test to output to an elementary stream rather than a program stream. g722enc: validate AVCodecContext.trellis g722enc: set frame_size, and also handle an odd number of input samples g722enc: split encoding into separate functions for trellis vs. no trellis mpegaudiodec: Use clearer pointer math tta: Fix returned error code at EOF ... Conflicts: libavcodec/h264.c libavcodec/indeo3.c libavcodec/interplayvideo.c libavcodec/ivi_common.c libavcodec/libxvidff.c libavcodec/mpegvideo.c libavcodec/ppc/mpegvideo_altivec.c libavcodec/tta.c libavcodec/utils.c libavfilter/vsrc_buffer.c libavformat/Makefile tests/fate/indeo.mak tests/ref/acodec/g722 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Skip compiling network.h and rtsp.h if networking is not enabled.Diego Biurrun2012-01-07
| | | | | | | | | | | | rtsp.h relies on network.h and the latter conditionally defines fallback OS structures that rely on configure tests, which are only run if networking is enabled.
| * cosmetics: drop some pointless parenthesesDiego Biurrun2012-01-07
| |
| * vqf: recognize more metadata chunksPaul B Mahol2012-01-07
| | | | | | | | | | | | | | Do not create tags for non-char chunks. Create readable tag for DSIZ chunk. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * tta: Fix returned error code at EOFMichael Niedermayer2012-01-07
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * tta: fix off be 1 error in the end detection.Michael Niedermayer2012-01-07
| | | | | | | | | | | | | | Fixes use of uninitialized values. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * ipmovie: Add param change side data if the video dimensions have changedPaul B Mahol2012-01-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * electronicarts: check bytes per sample for validityJanne Grunau2012-01-07
| | | | | | | | Prevents division by zero.
* | lavf: Do not attempt to use frame multi threading when probing.Michael Niedermayer2012-01-07
| | | | | | | | | | | | | | | | | | This fixes various problems with getting stream info. For example playback of the file of Ticket88. Multithreaded find_stream_info should be reenabled once it works correctly This partly reverts 212fd3a1f1121a9db20c478f1fccf15e8bb53c94 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix OOM error condition in idcin demuxer.Carl Eugen Hoyos2012-01-07
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: flicvideo: fix invalid reads vorbis: Avoid some out-of-bounds reads vqf: add more known extensions cabac: remove unused function renorm_cabac_decoder h264: Only use symbols from the SVQ3 decoder under proper conditionals. add bytestream2_tell() and bytestream2_seek() functions parsers: initialize MpegEncContext.slice_context_count to 1 spdifenc: use special alignment for DTS-HD length_code Conflicts: libavcodec/flicvideo.c libavcodec/h264.c libavcodec/mpeg4video_parser.c libavcodec/vorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vqf: add more known extensionsPaul B Mahol2012-01-06
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * spdifenc: use special alignment for DTS-HD length_codeAnssi Hannula2012-01-05
| | | | | | | | | | | | | | | | Align IEC 61937 length_code for DTS-HD so that (length_code & 0xf) == 0x8. This is reportedly needed with some receivers. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | tta: Fix returned error code at EOFMichael Niedermayer2012-01-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tta: fix off be 1 error in the end detection.Michael Niedermayer2012-01-07
| | | | | | | | | | | | Fixes use of uninitialized values. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Flush decoders correctly in avformat_find_stream_info().Reimar Döffinger2012-01-06
| | | | | | | | | | | | | | | | | | | | The decoders should not only be flushed on EOF or error, but also when e.g. probe size was reached. It is best to just always flush by default and only disable it explicitly when we know that we have everything we need. Fixes trac ticket #879. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) ipmovie: do not read audio packets before the codec is known truemotion2: check size before GetBitContext initialisation avio: Only do implicit network initialization for network protocols avio: Add an URLProtocol flag for indicating that a protocol uses network adpcm: ADPCM Electronic Arts has always two channels matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc() fate: Add missing reference file from 9b4767e4. mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions. 4xm: Prevent buffer overreads. mjpegdec: parse RSTn to prevent skipping other data in mjpeg_decode_scan vp3: add fate test for non-zero last coefficient vp3: fix streams with non-zero last coefficient swscale: remove unused U/V arguments from yuv2rgb_write(). timer: K&R formatting cosmetics lavf: cosmetics, reformat av_read_frame(). lavf: refactor av_read_frame() to make it easier to understand. Report an error if pitch_lag is zero in AMR-NB decoder. Revert "4xm: Prevent buffer overreads." 4xm: Prevent buffer overreads. 4xm: pass the correct remaining buffer size to decode_i2_frame(). ... Conflicts: libavcodec/4xm.c libavcodec/mjpegdec.c libavcodec/truemotion2.c libavformat/ipmovie.c libavformat/mov_chan.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ipmovie: do not read audio packets before the codec is knownJanne Grunau2012-01-05
| | | | | | | | Prevents a division by zero.
| * avio: Only do implicit network initialization for network protocolsMartin Storsjö2012-01-05
| | | | | | | | | | | | | | | | | | | | The implicit network initialization is set to be removed in the future, but is kept for compatibility. By not doing the implicit initialization for non-network protocols, we avoid the warning about avformat_network_init() not being called for these, where it really doesn't make much sense. Signed-off-by: Martin Storsjö <martin@martin.st>
| * avio: Add an URLProtocol flag for indicating that a protocol uses networkMartin Storsjö2012-01-05
| | | | | | | | | | | | | | This definition is in two files, since the definitions will move to the private header at the next bump. Signed-off-by: Martin Storsjö <martin@martin.st>
| * matroskadec: Fix a bug where a pointer was cached to an array that might ↵Chris Evans2012-01-05
| | | | | | | | | | | | | | | | | | | | later move due to a realloc() Fixes bug #190 Chromium bug #100492 related to CVE-2011-3893 Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions.Alex Converse2012-01-05
| |
| * lavf: cosmetics, reformat av_read_frame().Anton Khirnov2012-01-05
| |
| * lavf: refactor av_read_frame() to make it easier to understand.Anton Khirnov2012-01-05
| |
* | mov: support timecode extraction.Clément Bœsch2012-01-05
| |
* | mov: annotate read values in tmcd track.Clément Bœsch2012-01-05
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (46 commits) mtv: Make sure audio_subsegments is not 0 v4l2: use V4L2_FMT_FLAG_EMULATED only if it is defined avconv: add symbolic names for -vsync parameters flvdec: Fix compiler warning for uninitialized variables rtsp: Fix compiler warning for uninitialized variable ulti: convert to new bytestream API. swscale: Use standard multiple inclusion guards in ppc/ header files. Place some START_TIMER invocations in separate blocks. v4l2: list available formats v4l2: set the proper codec_tag v4l2: refactor device_open v4l2: simplify away io_method v4l2: cosmetics v4l2: uniform and format options v4l2: do not force interlaced mode avio: exit early in fill_buffer without read_packet vc1dec: fix invalid memory access for small video dimensions rv34: fix invalid memory access for small video dimensions rv34: joint coefficient decoding and dequantization avplay: Don't call avio_set_interrupt_cb(NULL) ... Conflicts: Changelog avconv.c doc/APIchanges doc/indevs.texi libavcodec/adxenc.c libavcodec/dnxhdenc.c libavcodec/h264.c libavdevice/v4l2.c libavformat/flvdec.c libavformat/mtv.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mtv: Make sure audio_subsegments is not 0Shitiz Garg2012-01-04
| | | | | | | | | | | | | | audio_subsegments would be 0 and cause floating point exceptions Fixes bugzilla #144 Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * flvdec: Fix compiler warning for uninitialized variablesJean First2012-01-04
| | | | | | | | | | | | | | These can't be used uninitialized in practice, but the compiler doesn't realize it. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Fix compiler warning for uninitialized variableJean First2012-01-04
| | | | | | | | | | | | | | This one won't ever be used uninitialized in practice, but the compiler doesn't realize it. Signed-off-by: Martin Storsjö <martin@martin.st>
| * avio: exit early in fill_buffer without read_packetJanne Grunau2012-01-04
| | | | | | | | | | | | | | Fixes an invalid free() with ass in avi. The sample in bug 98 passes parts of AVPacket.data as buffer for the AVIOContext. Since the packet is quite large fill_buffer tries to reallocate the buffer before doing nothing. Fixes bug 98.
| * adx: add an adx muxerJustin Ruggles2012-01-03
| |
| * adx: add AVFMT_GENERIC_INDEX to demuxer flags.Justin Ruggles2012-01-03
| | | | | | | | fixes seeking
* | Revert "rmdec: Avoid allocating huge packets"Michael Niedermayer2012-01-05
| | | | | | | | | | | | This reverts commit 66f71f3b5e2e7b6e5049bd9831c371e16aff8a53. This causes regressions with RDT.
* | lavf: use avg_frame_rate and packet number to exit find_stream_infoMichael Niedermayer2012-01-05
| | | | | | | | | | | | | | qatar does this too but clobbers the AVPacket.duration by approximate values. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: revert commit bb99ae3ae924c942a634bec7711ec7ee11c38eb9Michael Niedermayer2012-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | Author: Michael Niedermayer <michaelni@gmx.at> Date: Thu Nov 3 22:38:10 2011 +0100 lavf: fix null pointer dereference in rdt Signed-off-by: Michael Niedermayer <michaelni@gmx.at> This is no longer needed and causes various problems with RTSP Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mkv: Fix a bug where a pointer was cached to an array that might later move ↵Chris Evans2012-01-04
| | | | | | | | | | | | | | | | | | | | | | | | due to a realloc() BUG=100492 Review URL: http://codereview.chromium.org/8366004 Fixes: 1 of 2 for CVE-2011-3893 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Insert missing newline at end of error log message in mov demuxer.Andrew Ryan2012-01-04
| |
* | yuv4 libquicktime packed 4:2:0 encoder and decoder.Carl Eugen Hoyos2012-01-04
| | | | | | | | | | Reviewed-by: Derek Buitenhuis Reviewed-by: Paul B Mahol
* | v308 Quicktim Uncompressed 4:4:4 encoder and decoder.Carl Eugen Hoyos2012-01-04
| | | | | | | | | | Reviewed-by: Derek Buitenhuis Reviewed-by: Paul B Mahol
* | Add decoder for Avid 1:1 10-bit RGB Packer (AVrp).Carl Eugen Hoyos2012-01-04
| | | | | | | | | | | | Fixes ticket #525. Reviewed-by: Paul B Mahol
* | lavf: Fix try_decode_frame() so it doesnt loop infinitely.Michael Niedermayer2012-01-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>