aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * mkv: report average framerate as minimal as wellLuca Barbato2012-04-171-0/+1
| | | | | | | | | | This is in line with other demuxers and overall seems more correct than assuming codec time base.
* | ogm: Fix division by 0Michael Niedermayer2012-04-181-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: check that the context to avformat_open_input() is valid.Michael Niedermayer2012-04-181-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-181-9/+58
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: aacenc: Fix issues with huge values of bit_rate. dv_tablegen: Drop unnecessary av_unused attribute from dv_vlc_map_tableinit(). proresenc: multithreaded quantiser search riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header avconv: only set the "channels" option when it exists for the specified input format avplay: update get_buffer to be inline with avconv aacdec: More robust output configuration. faac: Fix multi-channel ordering faac: Add .channel_layouts rtmp: Support 'rtmp_playpath', an option which overrides the stream identifier rtmp: Support 'rtmp_app', an option which overrides the name of application avutil: add better documentation for AVSampleFormat Conflicts: libavcodec/aac.h libavcodec/aacdec.c libavcodec/aacenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE ↵Justin Ruggles2012-04-171-1/+1
| | | | | | | | | | | | | | header This matches the value for the plain WAVEFORMATEX header. Also fixes stream copy to WAVE for non-16-bit raw pcm.
| * rtmp: Support 'rtmp_playpath', an option which overrides the stream identifierSamuel Pitoiset2012-04-161-8/+18
| | | | | | | | | | | | | | | | | | This option is the stream identifier to play or to publish. Sometimes the URL parser cannot determine the correct playpath automatically, so it must be given explicitly using this option (ie. -rtmp_playpath). Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: Support 'rtmp_app', an option which overrides the name of applicationSamuel Pitoiset2012-04-161-1/+40
| | | | | | | | | | | | | | | | This option is the name of application to connect on the RTMP server. Sometimes the URL parser cannot determine the app name automatically, so it must be given explicitly using this option (ie. -rtmp_app). Signed-off-by: Martin Storsjö <martin@martin.st>
* | avidec: Dont crash on avi packets that belong to dv streams in dv in aviMichael Niedermayer2012-04-171-0/+5
| | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: document early_exit argumentMichael Niedermayer2012-04-171-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: check headerstrip data availability.Michael Niedermayer2012-04-171-0/+4
| | | | | | | | | | | | | | Fixes null ptr dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: Safety check against stream counts being inconsistent in seek()Michael Niedermayer2012-04-171-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: Recreate streams only in the 1 stream case.Michael Niedermayer2012-04-171-0/+3
| | | | | | | | | | | | | | | | Other cases are not supported and lead to inconsistencies which can lead to out of array writes. Reported-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: use av_grow_packet in merge_packets.Nicolas George2012-04-161-6/+4
| | | | | | | | | | | | | | It ensures that the packet is properly padded and makes the code simpler. Fixes trac ticket #1223.
* | Add skip_to_keyframe stream variable.Reimar Döffinger2012-04-163-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | This replaces the matroskadec one with the same name. The advantage is not only easier reuse in other demuxers but also that we can make the decisions after the parser. This fixes seeking in files that mark the keyframes incorrectly, for example the file in track ticket #1003. The matroska variable is still kept to be able to complain about such broken files. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | omadec: make sample rate table large enough to prevent out of array reading.Michael Niedermayer2012-04-162-2/+2
| | | | | | | | | | | | | | The new values lead to error messages when used Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 4xmdemux: Check chunk sizeMichael Niedermayer2012-04-161-0/+4
| | | | | | | | | | | | | | Fixes over reading the header array Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | omadec: check GEOB sizes against buffer sizeMichael Niedermayer2012-04-161-0/+4
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flvdec: allocate large enough buffer so get_bits() doesnt overreadMichael Niedermayer2012-04-161-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | segafilm: make the loop condition in film_read_packet() match the contents.Michael Niedermayer2012-04-161-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: reset dref_count on realloc to keep values consistent.Michael Niedermayer2012-04-151-0/+1
| | | | | | | | | | | | This fixes a potential crash. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-151-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doc: Improve suggested Emacs settings for our coding style. utvideo: Remove unused variable 'src_size' mov: free memory on header parsing failure mov: fix leaking memory with multiple drefs. swscale: clip before assigning tables in RGB output functions. swscale: fix off-by-one in second coefficient in bilinear filters. Conflicts: libavformat/mov.c libswscale/output.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: free memory on header parsing failureDale Curtis2012-04-141-33/+35
| | | | | | | | | | | | Call mov_read_close when mov_read_header fails. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mov: fix leaking memory with multiple drefs.Dale Curtis2012-04-141-0/+1
| | | | | | | | | | | | | | | | | | Instead of allocating over the original, free first. MOVStreamContext is zero initialized so no double free will occur. Same style as other fixes for the same problem in this file. Signed-off-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-143-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vsrc_buffer: fix check from 7ae7c41. libxvid: Reorder functions to avoid forward declarations; make functions static. libxvid: drop some pointless dead code wmal: vertical alignment cosmetics wmal: Warn about missing bitstream splicing feature and ask for sample. wmal: Skip seekable_frame_in_packet. wmal: Drop unused variable num_possible_block_size. avfiltergraph: make the AVFilterInOut alloc/free API public graphparser: allow specifying sws flags in the graph description. graphparser: fix the order of connecting unlabeled links. graphparser: add avfilter_graph_parse2(). vsrc_buffer: allow using a NULL buffer to signal EOF. swscale: handle last pixel if lines have an odd width. qdm2: fix a dubious pointer cast WMAL: Do not try to read rawpcm coefficients if bits is invalid mov: Fix detecting there is no sync sample. tiffdec: K&R cosmetics avf: has_duration does not check the global one dsputil: fix optimized emu_edge function on Win64. Conflicts: doc/APIchanges libavcodec/libxvid_rc.c libavcodec/libxvidff.c libavcodec/tiff.c libavcodec/wmalosslessdec.c libavfilter/avfiltergraph.h libavfilter/graphparser.c libavfilter/version.h libavfilter/vsrc_buffer.c libswscale/output.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Fix detecting there is no sync sample.Yusuke Nakamura2012-04-132-1/+5
| | | | | | | | | | | | Stss atom without entries doesn't mean every sample is a sync sample. Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 23:26:10 +0000