summaryrefslogtreecommitdiffstats
path: root/libavformat/internal.h
Commit message (Collapse)AuthorAgeFilesLines
...
| * lavf: replace rename() with ff_rename()Luca Barbato2014-10-241-0/+14
| | | | | | | | | | | | | | | | | | The new function wraps errno so that its value is correctly reported when other functions overwrite it (eg. in case of logging). CC: [email protected] Bug-Id: CID 1135748 Signed-off-by: Vittorio Giovara <[email protected]>
* | avformat: Add and use ff_copy_whitelists()Michael Niedermayer2014-10-241-0/+4
| | | | | | | | | | | | | | Fixes potential security issue in case of running out of memory Found-by: ubitux Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '2d6e58497e76836604364b037df9b00ba3d75b69'Michael Niedermayer2014-10-151-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '2d6e58497e76836604364b037df9b00ba3d75b69': lavf: switch to AVCodecContext.framerate for demuxing Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <[email protected]>
| * lavf: switch to AVCodecContext.framerate for demuxingAnton Khirnov2014-10-151-1/+1
| |
| * lavf: eliminate ff_get_audio_frame_size()Anton Khirnov2014-08-131-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is basically a wrapper around av_get_audio_frame_duration(), with a fallback to AVCodecContext.frame_size. However, that field is set only when the stream codec context is actually used for encoding or decoding, which is discouraged. For muxing, it is generally the responsibility of the caller to set the packet duration. For demuxing, if the duration is not stored at the container level, it should be set by the parser. Therefore, removing the frame_size fallback should not break any important case.
* | lavf: eliminate ff_get_audio_frame_size()Anton Khirnov2014-08-141-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is basically a wrapper around av_get_audio_frame_duration(), with a fallback to AVCodecContext.frame_size. However, that field is set only when the stream codec context is actually used for encoding or decoding, which is discouraged. For muxing, it is generally the responsibility of the caller to set the packet duration. For demuxing, if the duration is not stored at the container level, it should be set by the parser. Therefore, removing the frame_size fallback should not break any important case. (cherry picked from commit 30e50c50274f88f0f5ae829f401cd3c7f5266719) Conflicts: libavformat/utils.c Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mux: support re-interleaving packets in ff_write_chained()Michael Niedermayer2014-07-241-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '324ff59444ff5470bb325ff1e2be7c4b054fc944'Michael Niedermayer2014-07-171-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '324ff59444ff5470bb325ff1e2be7c4b054fc944': avpacket: Check for and return errors in ff_interleave_add_packet() Conflicts: libavformat/audiointerleave.c libavformat/internal.h libavformat/mux.c See: 4d7c71c36467331f1e0c0f17af9f371d33308a9c Merged-by: Michael Niedermayer <[email protected]>
| * avpacket: Check for and return errors in ff_interleave_add_packet()Nidhi Makhijani2014-07-171-2/+2
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | Various small spelling fixes.Reimar Döffinger2014-04-221-3/+3
| | | | | | | | Signed-off-by: Reimar Döffinger <[email protected]>
* | avformat: add av_format_inject_global_side_data(), and disable it by defaultMichael Niedermayer2014-04-151-0/+2
| | | | | | | | | | | | | | | | | | | | After this commit applications needs to call av_format_inject_global_side_data() or handle AVStream side data by some other means if they want it not to be lost. This fixes a API incompatibility with libav. libav API does not allow the data to be passed through AVPackets Signed-off-by: Michael Niedermayer <[email protected]>
* | lavf: add write_uncoded_frame() API.Nicolas George2014-02-111-0/+14
| |
* | Merge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74'Michael Niedermayer2014-02-041-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '33c859c142ef3f49b7a6227014ad92a680cf4d74': lavf: ignore attachment streams for interleaving purposes Conflicts: libavformat/avformat.h libavformat/internal.h libavformat/mux.c Merged-by: Michael Niedermayer <[email protected]>
| * lavf: ignore attachment streams for interleaving purposesAnton Khirnov2014-02-041-0/+8
| | | | | | | | Those streams should never get any packets by definition.
* | Merge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'Michael Niedermayer2014-01-261-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654': avformat: utils: K&R formatting cosmetics Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <[email protected]>
* | avformat: add ff_get_extradata()Michael Niedermayer2013-12-251-0/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/utils: factor rfps calculation outMichael Niedermayer2013-12-051-0/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878'Michael Niedermayer2013-11-141-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878': lavf: improve support for AVC-Intra files. Conflicts: libavformat/internal.h libavformat/isom.c libavformat/mxfdec.c libavformat/utils.c Merged-by: Michael Niedermayer <[email protected]>
| * lavf: improve support for AVC-Intra files.Reimar Döffinger2013-11-141-0/+6
| | | | | | | | | | | | | | | | Generate extradata with SPS/PPS based on container dimensions. Authors of this commit are: Reimar and Thomas Mundt Signed-off-by: Anton Khirnov <[email protected]>
* | avformat: add ff_alloc_extradata() helperPaul B Mahol2013-10-131-0/+9
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | avformat: move PROBE_BUF_M* to internal.hMichael Niedermayer2013-08-261-0/+4
| | | | | | | | | | | | They will be used by the mp3 probe function in the next commit Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/utils: factor ff_find_last_ts() out of ff_gen_search()Michael Niedermayer2013-07-061-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'Michael Niedermayer2013-06-171-36/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef': avf: move url utility functions in a separate file Conflicts: libavformat/internal.h Merged-by: Michael Niedermayer <[email protected]>
| * avf: move url utility functions in a separate fileLuca Barbato2013-06-161-36/+0
| |
* | Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'Michael Niedermayer2013-06-161-2/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c': avf: move ff_http_match_no_proxy to network Conflicts: libavformat/internal.h libavformat/utils.c Merged-by: Michael Niedermayer <[email protected]>
| * avf: move ff_http_match_no_proxy to networkLuca Barbato2013-06-161-2/+0
| | | | | | | | It is only used by network protocols.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-281-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: Add a fate test for the noproxy pattern matching lavf: Handle the environment variable no_proxy more properly Conflicts: libavformat/Makefile libavformat/internal.h libavformat/tls.c libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <[email protected]>
| * lavf: Handle the environment variable no_proxy more properlyMartin Storsjö2013-02-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The handling of the environment variable no_proxy, present since one of the initial commits (de6d9b6404), is inconsistent with how many other applications and libraries interpret this variable. Its bare presence does not indicate that the use of proxies should be skipped, but it is some sort of pattern for hosts that does not need using a proxy (e.g. for a local network). As investigated by Rudolf Polzer, different libraries handle this in different ways, some supporting IP address masks, some supporting arbitrary globbing using *, some just checking that the pattern matches the end of the hostname without regard for whether it actually is the right domain or a domain that ends in the same string. This simple logic should be pretty similar to the logic used by lynx and curl. Signed-off-by: Martin Storsjö <[email protected]>
| * doxy: Clarify what avpriv_set_pts_info doesDerek Buitenhuis2012-12-171-5/+7
| | | | | | | | | | | | The "pts for a given stream" was nonsensical. Signed-off-by: Derek Buitenhuis <[email protected]>
* | Support more AVC-Intra filesReimar Döffinger2013-01-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Followup to http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/151321 patch by Reimar and Thomas Mundt fixes some AVC-Intra files from different tickets. It does not fix http://samples.ffmpeg.org/ffmpeg- bugs/trac/ticket524/AVCI50.mov Authors of this commit are: Reimar and Thomas Mundt Patch and commit message mostly taken from ffmpeg-devel, mail by Carl Signed-off-by: Michael Niedermayer <[email protected]>
* | doxy: Clarify what avpriv_set_pts_info doesDerek Buitenhuis2012-12-171-5/+7
| | | | | | | | | | | | The "pts for a given stream" was nonsensical. Signed-off-by: Derek Buitenhuis <[email protected]>
* | Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66'Michael Niedermayer2012-11-291-0/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66': lavf: move nuv fourcc audio tags from riff to nuv lavf: add a common function for selecting a pcm codec from parameters Conflicts: libavformat/internal.h libavformat/mov.c libavformat/riff.c Merged-by: Michael Niedermayer <[email protected]>
| * lavf: add a common function for selecting a pcm codec from parametersJustin Ruggles2012-11-281-0/+15
| |
* | Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'Michael Niedermayer2012-11-291-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bfe5454cd238b16e7977085f880205229103eccb': lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h lavf: move "MP3 " fourcc from riff to nut fate: vpx: Add dependencies fate: Fix wavpack-matroskamode test dependencies x86: dsputilenc: port to cpuflags Conflicts: libavformat/internal.h libavformat/nut.c tests/fate/vpx.mak Merged-by: Michael Niedermayer <[email protected]>
| * lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.hJustin Ruggles2012-11-281-0/+3
| |
* | ensure comment blocks that contain doxygen commands start with double asterixPeter Ross2012-11-211-1/+1
| | | | | | | | | | Reveiwed-by: Stefano Sabatini <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-151-2/+3
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: bgmc: Fix av_malloc checks in ff_bgmc_init() rtp: set the payload type as stream id Conflicts: libavformat/rtpenc_chain.c Merged-by: Michael Niedermayer <[email protected]>
| * rtp: set the payload type as stream idLuca Barbato2012-11-141-2/+3
| | | | | | | | | | | | | | Support multiple video/audio streams with different format in the same session. Signed-off-by: Luca Barbato <[email protected]>
* | mux/nut: factorize ff_choose_timebase() out of nutMichael Niedermayer2012-10-031-0/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd'Michael Niedermayer2012-10-021-0/+9
|\| | | | | | | | | | | | | | | | | | | | | * commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd': avformat: split muxing functions from util.c Conflicts: libavformat/internal.h libavformat/utils.c Merged-by: Michael Niedermayer <[email protected]>
| * avformat: split muxing functions from util.cLuca Barbato2012-10-011-0/+9
| |
* | lavf: factor ff_free_stream() outMichael Niedermayer2012-08-211-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <[email protected]>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-071-3/+3
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-211-0/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) avconv: free packet in write_frame() when discarding due to frame number limit FATE: use +/- flag option syntax for vp8 emu-edge tests lavf: make av_interleave_packet_per_dts() private. lavf: deprecate av_read_packet(). oggdec: output correct timestamps for Vorbis avconv: pass input stream timestamps to audio encoders lavc: shrink encoded audio packet size after encoding. xa: set correct bit rate xa: do not set bit_rate, block_align, or bits_per_coded_sample xa: fix end-of-file handling xa: fix timestamp calculation bink: fix typo in FFALIGN() argument bink: align plane width to 8 when calculating bundle sizes doc: pass -Idoc texi2html and texi2pod doc: texi2pod: add -I flag movenc: Add a min_frag_duration option rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers libavformat: Set the default for the max_delay option to -1 Generate manpages for AV{Format,Codec}Context AVOptions. doc/avconv: remove entries for AVOptions. ... Conflicts: doc/Makefile doc/ffmpeg.texi doc/muxers.texi ffmpeg.c libavcodec/Makefile libavcodec/options.c libavcodec/vp8.c libavformat/options.c tests/fate/demux.mak tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 Merged-by: Michael Niedermayer <[email protected]>
| * lavf: make av_interleave_packet_per_dts() private.Anton Khirnov2012-03-201-0/+18
| | | | | | | | | | There is no reason for it to be public, it's only meant to be used internally.
| * lavf: deprecate av_read_packet().Anton Khirnov2012-03-201-0/+9
| | | | | | | | | | | | The caller can achieve the same effect (i.e. getting raw unparsed/mangled packets) with av_read_frame() and AVFMT_FLAG_NOPARSE | AVFMT_FLAG_NOFILLIN
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-011-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (58 commits) amrnbdec: check frame size before decoding. cscd: use negative error values to indicate decode_init() failures. h264: prevent overreads in intra PCM decoding. FATE: do not decode audio in the nuv test. dxa: set audio stream time base using the sample rate psx-str: do not allow seeking by bytes asfdec: Do not set AVCodecContext.frame_size vqf: set packet parameters after av_new_packet() mpegaudiodec: use DSPUtil.butterflies_float(). FATE: add mp3 test for sample that exhibited false overreads fate: add cdxl test for bit line plane arrangement vmnc: return error on decode_init() failure. libvorbis: add/update error messages libvorbis: use AVFifoBuffer for output packet buffer libvorbis: remove unneeded e_o_s check libvorbis: check return values for functions that can return errors libvorbis: use float input instead of s16 libvorbis: do not flush libvorbis analysis if dsp state was not initialized libvorbis: use VBR by default, with default quality of 3 libvorbis: fix use of minrate/maxrate AVOptions ... Conflicts: Changelog doc/APIchanges libavcodec/avcodec.h libavcodec/dpxenc.c libavcodec/libvorbis.c libavcodec/vmnc.c libavformat/asfdec.c libavformat/id3v2enc.c libavformat/internal.h libavformat/mp3enc.c libavformat/utils.c libavformat/version.h libswscale/utils.c tests/fate/video.mak tests/ref/fate/nuv tests/ref/fate/prores-alpha tests/ref/lavf/ffm tests/ref/vsynth1/prores tests/ref/vsynth2/prores Merged-by: Michael Niedermayer <[email protected]>
| * lavf: move CodecMime from matroska.h to internal.hAnton Khirnov2012-02-291-0/+5
| | | | | | | | it will be useful for attached pictures in ID3v2
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-161-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) ppc: Add ff_ prefix to nonstatic symbols sh4: Add ff_ prefix to nonstatic symbols mpegvideo: Add ff_ prefix to nonstatic functions rtjpeg: Add ff_ prefix to nonstatic symbols rv: Add ff_ prefix to nonstatic symbols vp56: Add ff_ prefix to nonstatic symbols vorbis: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefix to nonstatic symbols vc1: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefixes to nonstatic symbols snow: Add ff_ prefix to nonstatic symbols mpeg12: Add ff_ prefix to nonstatic symbols mpeg4: Add ff_ prefixes to nonstatic symbols lagarith: Add ff_ prefix to lag_rac_init libavcodec: Add ff_ prefix to j_rev_dct* dsputil: Add ff_ prefix to inv_zigzag_direct16 libavcodec: Prefix fdct_ifast, fdct_ifast248 dsputil: Add ff_ prefix to the dsputil*_init* functions libavcodec: Add ff_ prefix to some nonstatic symbols vlc/rl: Add ff_ prefix to the nonstatic symbols ... Conflicts: libavcodec/Makefile libavcodec/allcodecs.c libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h263.h libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/nuv.c libavcodec/ppc/dsputil_ppc.c libavcodec/proresdsp.c libavcodec/svq3.c libavcodec/version.h libavformat/dv.h libavformat/dvenc.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-22 00:52:13 +0000