aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* isom: remove duplicate line.Michael Niedermayer2012-04-301-1/+0
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* isom: Clarify comment for 'ec-3' fourccDerek Buitenhuis2012-04-301-1/+1
| | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* rmenc: more than 2 streams are not currently possible.Reimar Döffinger2012-04-291-0/+5
| | | | | | | | | | | | | It is possible that just extending the RMMuxContext.streams array would avoid it. It is also possible that two audio streams will fail to mux correctly as well, though at least it should not crash for this reason. I do not feel like checking either of these. This patch fixes trac issue #1022 (at least it makes it exit with a proper error message instead of crashing). Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* nutdec: minor simplification.Reimar Döffinger2012-04-291-5/+3
| | | | | | | Also fixes an (incorrect) "control reaches end of non-void function" warning with some compilers. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* nutdec: replace assert with av_assert0.Reimar Döffinger2012-04-291-11/+9
| | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-283-9/+40
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: new assembly version of get_cabac for x86_64 with PIC h264: use one table instead of several for cabac functions h264: (trivial) remove unneeded macro argument in x86/cabac.h libschroedingerdec: check malloc segment: reorder seg_write_header allocation avio: make avio_close(NULL) a no-op mov: Parse EC3SpecificBox (dec3 atom). Conflicts: libavcodec/cabac.c libavcodec/x86/cabac.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: reorder seg_write_header allocationLuca Barbato2012-04-271-8/+6
| | | | | | | | | | As pointed by Paul B Mahol <onemda@gmail.com> the previous code could lead to null pointer dereference.
| * avio: make avio_close(NULL) a no-opLuca Barbato2012-04-271-1/+5
| | | | | | | | Its behaviour in line with ffurl_close(NULL).
| * mov: Parse EC3SpecificBox (dec3 atom).Yusuke Nakamura2012-04-271-0/+29
| | | | | | | | | | | | | | | | Skip to parse fields for additional independent substreams and its associated dependent substreams since libavcodec's E-AC-3 decoder does not support them yet. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | lavf remove duplicated check in has_durationJean First2012-04-281-2/+0
| | | | | | | | | | | | | | | | | | this hunk was merged in 8b97ae64 and cbf767a8 although the check was there a few lines above since cdced09e. I removed the first check to reduce the differences to libav. Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avio: change ffurl_alloc return code.Nicolas George2012-04-281-1/+1
| | | | | | | | | | If the designated protocol is not found, return AVERROR_PROTOCOL_NOT_FOUND instead of AVERROR(ENOENT).
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-271-0/+3
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegts: Make sure we don't return uninitialized packets gitignore: replace library catch-all pattern by more specific patterns Conflicts: .gitignore Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Make sure we don't return uninitialized packetsMartin Storsjö2012-04-271-0/+3
| | | | | | | | | | | | | | | | | | This fixes crashes, where the demuxer could return 0 even if the returned AVPacket isn't initialized at all. This could happen if running into EOF or running out of probesize with non-seekable sources. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/microdvd: set packet duration.Clément Bœsch2012-04-271-0/+11
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-262-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dsputil: fix invalid array indexing configure: add libavresample to rpath build: icc: silence some warnings fft-test: add option to set cpuflag mask cpu: recognise only cpu flag names pertinent to the architecture avutil: add av_parse_cpu_flags() function vp8: armv6: fix non-armv6t2 build vp8: armv6 optimisations vp8: arm: separate ARMv6 functions from NEON ARM: add some compatibility macros mov: support eac3 audio avf: fix faulty check in has_duration Conflicts: configure doc/APIchanges ffmpeg.c libavcodec/arm/Makefile libavcodec/arm/asm.S libavcodec/arm/vp8dsp_armv6.S libavcodec/arm/vp8dsp_init_arm.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: support eac3 audioHendrik Leppkes2012-04-251-0/+1
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avf: fix faulty check in has_durationLuca Barbato2012-04-251-1/+1
| | | | | | | | An invalid duration is AV_NOPTS_VALUE not 0.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-241-1/+3
|\| | | | | | | | | | | | | | | * qatar/master: avconv: fix a segfault on -c copy with -filter_complex. isom: Support more DTS codec identifiers. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * isom: Support more DTS codec identifiers.Yusuke Nakamura2012-04-231-1/+3
| | | | | | | | | | | | DTS LBR identifier ('dtse') is not included since libavcodec doesn't support it yet. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-242-7/+110
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: matroska: Clear prev_pkt between seeks. avutil: change default buffer size alignment for sample buffer functions audemux: Add a sanity check for the number of channels Remove libdirac decoder. matroska: Add incremental parsing of clusters. avconv: fix off by one check in complex_filter mpegts: Try seeking back even for nonseekable protocols swscale: K&R formatting cosmetics (part III) Conflicts: configure doc/general.texi doc/platform.texi ffmpeg.c libavcodec/Makefile libavcodec/allcodecs.c libavcodec/libdirac.h libavcodec/libdiracdec.c libavformat/au.c libavformat/mpegts.c libswscale/input.c tests/ref/seek/lavf_mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroska: Clear prev_pkt between seeks.Dale Curtis2012-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | The new incremental parser doesn't always clear prev_pkt, however the packet queue is cleared when seeking. Which leads to a use-after-free. Verified using Valgrind. Signed-off-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * audemux: Add a sanity check for the number of channelsMichael Niedermayer2012-04-231-0/+5
| | | | | | | | | | | | | | Fixes a division by 0. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Martin Storsjö <martin@martin.st>
| * matroska: Add incremental parsing of clusters.Dale Curtis2012-04-221-6/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduces the amount of upfront data required for cluster parsing thus decreasing latency on seek and startup. The change in the seek-lavf_mkv FATE test is due to incremental parsing no longer reading as much data as the old parser and thus not having that additional data to generate index entries based on keyframes. Index entries are added correctly as the file is parsed. All FATE tests pass and Chrome has been using this patch for ~6 months without issue. Currently incremental parsing is not supported for files with SSA tracks since they require merging packets between clusters. In this case the code falls back to non-incremental parsing. Signed-off-by: Aaron Colwell <acolwell@chromium.org> Signed-off-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mpegts: Try seeking back even for nonseekable protocolsMartin Storsjö2012-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mpegts demuxer reads 5 KB at startup just for discovering the packet size. Since the default avio buffer size is 32 KB, the seek back to the start will in most cases be within the avio buffer, and will in most cases succeed even if the actual protocol isn't seekable. This makes the demuxer startup faster/with less data when reading data from a non-seekable input, by not skipping the first few KB. If it fails, don't warn if the protocol isn't seekable, making it behave as before in the failure case. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf: print a warning if probesize seems not enough.Nicolas George2012-04-231-0/+6
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-221-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ARM: allow runtime masking of CPU features dsputil: remove unused functions mov: Treat keyframe indexes as 1-origin if starting at non-zero. mov: Take stps entries into consideration also about key_off. Remove lowres video decoding Conflicts: ffmpeg.c ffplay.c libavcodec/arm/vp8dsp_init_arm.c libavcodec/libopenjpegdec.c libavcodec/mjpegdec.c libavcodec/mpegvideo.c libavcodec/utils.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Treat keyframe indexes as 1-origin if starting at non-zero.Yusuke Nakamura2012-04-211-1/+1
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mov: Take stps entries into consideration also about key_off.Yusuke Nakamura2012-04-211-1/+1
| | | | | | | | | | | | Splitted files don't start always from a sync sample. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | audemux: Fix potential integer overflow leading to a division by 0Michael Niedermayer2012-04-221-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | audemux: Check channels isnt 0Michael Niedermayer2012-04-221-0/+5
| | | | | | | | | | | | | | Fixes a division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wtvdec: Check that stream private context has been allocated before use.Michael Niedermayer2012-04-221-1/+1
| | | | | | | | | | | | | | This fixes a null ptr dereference with attachments Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | smackerdemux: Allocate padding for extradataMichael Niedermayer2012-04-221-1/+1
| | | | | | | | | | | | | | Fixes slight overread. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-211-12/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: remove AVCodecContext.dsp_mask avconv: fix a segfault when default encoder for a format doesn't exist. utvideo: general cosmetics aac: Handle HE-AACv2 when sniffing a channel order. movenc: Support high sample rates in isomedia formats by setting the sample rate field in stsd to 0. xxan: Remove write-only variable in xan_decode_frame_type0(). ivi_common: Initialize a variable at declaration in ff_ivi_decode_blocks(). Conflicts: ffmpeg.c libavcodec/utvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Support high sample rates in isomedia formats by setting the sample ↵Alex Converse2012-04-201-12/+7
| | | | | | | | | | | | rate field in stsd to 0. Libisomediafile appears to always set this field to zero.
* | xmvdemux: prefer av_freep() to deallocate audio stream structs.Michael Niedermayer2012-04-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xmvdemux: dont let current_stream become invalid.Michael Niedermayer2012-04-211-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-202-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: add a cook parser to get subpacket duration FATE: allow lavf tests to alter input parameters FATE: replace the acodec-pcm_s24daud test with an enc_dec_pcm checksum test FATE: replace the acodec-g726 test with 4 new encode/decode tests FATE: replace current g722 encoding tests with an encode/decode test FATE: add a pattern rule for generating asynth wav files FATE: optionally write a WAVE header in audiogen avutil: add audio fifo buffer Conflicts: doc/APIchanges libavcodec/version.h libavutil/avutil.h tests/Makefile tests/codec-regression.sh tests/fate/voice.mak tests/lavf-regression.sh tests/ref/acodec/g722 tests/ref/acodec/g726 tests/ref/acodec/pcm_s24daud tests/ref/lavf/dv_fmt tests/ref/lavf/gxf tests/ref/lavf/mxf tests/ref/lavf/mxf_d10 tests/ref/seek/lavf_dv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: add a cook parser to get subpacket durationJustin Ruggles2012-04-201-0/+1
| | | | | | | | Fixes jittery video playback of rm files with cook audio.
* | mxfdec: fix memleak on read error/EOF.Reimar Döffinger2012-04-201-2/+2
| | | | | | | | | | | | | | This also matches the rest of the demuxer which will return partial packets. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avidec: zero extradata paddingMichael Niedermayer2012-04-191-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mtvdec: check that the buf is large enough for probingMichael Niedermayer2012-04-191-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jvdec: Make sure there is enough data for the id string.Michael Niedermayer2012-04-191-2/+2
| | | | | | | | | | | | Previously too little data could lead to a false detection. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-192-3/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dv: Initialize encoder tables during encoder init. dv: Replace some magic numbers by the appropriate #define. FATE: pass the decoded output format and audio source file to enc_dec_pcm FATE: specify the input format when decoding in enc_dec_pcm() x86inc: support AVX abstraction for 2-operand instructions configure: detect PGI compiler and set suitable flags avconv: check for an incompatible changing channel layout avio: make AVIOContext.av_class pointer to const nutdec: add malloc check and fix const to non-const conversion warnings Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: make AVIOContext.av_class pointer to constMans Rullgard2012-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | Fix this warning: libavformat/aviobuf.c:663:20: warning: assignment discards qualifiers from pointer target type Although this is a public header, it should remain source and binary compatible. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * nutdec: add malloc check and fix const to non-const conversion warningsMans Rullgard2012-04-181-2/+6
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | mxfdec: Add missing break in frame layout parsingMatthieu Bouron2012-04-191-0/+1
| | | | | | | | | | Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxf: Fix frame layout valuesMatthieu Bouron2012-04-191-2/+2
| | | | | | | | | | Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-181-3/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ppc: drop unused function dct_quantize_altivec() mpegaudiodec: Do not discard mp_decode_frame() return value. matroska: do not set invalid default duration if frame rate is zero mkv: use av_reduce instead of av_d2q for framerate estimation mkv: report average framerate as minimal as well avcodec_string: Favor AVCodecContext.codec over the default codec. cook: Make constants passed to AV_BE2NE32C() unsigned to avoid signed overflow. Conflicts: libavcodec/cook.c libavcodec/ppc/mpegvideo_altivec.c libavcodec/utils.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroska: do not set invalid default duration if frame rate is zeroMans Rullgard2012-04-181-1/+1
| | | | | | | | | | | | | | | | | | If a video track specifies a zero frame rate (invalid but occurs), this results in a division by zero and subsequent undefined conversion to integer. Setting the default duration from the frame rate only if the latter is greater than zero avoids such problems. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mkv: use av_reduce instead of av_d2q for framerate estimationLuca Barbato2012-04-171-3/+5
| | | | | | | | It avoids some rounding errors.
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 11:13:08 +0000