summaryrefslogtreecommitdiff
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAge
...
* | avformat_free_context: allow NULL as argumentMichael Niedermayer2012-10-20
| | | | | | | | | | Fixes CID703682 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | utils: consider mpeg4 in mp4/mov to have a unreliable timebaseMichael Niedermayer2012-10-16
| | | | | | | | | | | | Partly fixes Ticket1664 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: fix fps detection with PAFF H.264Michael Niedermayer2012-10-14
| | | | | | | | | | Fixes Ticket1065 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avio: redesign ffio_rewind_with_probe_data()Michael Niedermayer2012-10-13
| | | | | | | | | | | | | | This prevents a double free Fixes CID718285 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | update_initial_timestamps: increase pts_buffer sizeMichael Niedermayer2012-10-12
| | | | | | | | | | Fixes CID733786 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: do not prematurely accept a format with low score in init_input()Michael Niedermayer2012-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add a AVPROBE_SCORE_RETRY instead of using hardcoded values.Michael Niedermayer2012-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f'Michael Niedermayer2012-10-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f': adxdec: use planar sample format adpcmdec: use planar sample format for adpcm_thp adpcmdec: use planar sample format for adpcm_ea_xas adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3 adpcmdec: use planar sample format for adpcm_xa adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3 adpcmdec: use planar sample format for adpcm_4xm adpcmdec: use planar sample format for adpcm_ima_wav adpcmdec: use planar sample format for adpcm_ima_qt pcmdec: use planar sample format for pcm_lxf mace: use planar sample format atrac1: use planar sample format build: non-x86: Only compile mpegvideo optimizations when necessary rtpdec_mpeg4: au_headers is a single array, simple av_free is enough avcodec: free extended_data instead address of it fate: Add tests of the ff_make_absolute_url function url: Handle relative urls starting with two slashes url: Handle relative urls being just a new query string url: Don't treat slashes in query parameters as directory separators Conflicts: libavcodec/adxdec.c libavcodec/mips/Makefile libavcodec/pcm.c libavcodec/utils.c libavformat/Makefile libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * url: Handle relative urls starting with two slashesDuncan Salerno2012-10-09
| | | | | | | | | | | | This is defined by RFC 3986 section 5.4.1 to be handled this way. Signed-off-by: Martin Storsjö <martin@martin.st>
| * url: Handle relative urls being just a new query stringDuncan Salerno2012-10-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * url: Don't treat slashes in query parameters as directory separatorsDuncan Salerno2012-10-09
| | | | | | | | | | | | | | Strip off query parameters from the original url before applying the new relative path. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov2012-10-08
| |
* | Merge commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd'Michael Niedermayer2012-10-02
|\| | | | | | | | | | | | | | | | | | | | | * commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd': avformat: split muxing functions from util.c Conflicts: libavformat/internal.h libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: split muxing functions from util.cLuca Barbato2012-10-01
| |
* | Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'Michael Niedermayer2012-10-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d': avconv: improve sample format negotiation for decoder request Opus encoder using libopus mpegts: Drop pointless casting of hex_dump_debug arguments avformat: const correctness for av_hex_dump / av_hex_dump_log wmadec: Adjust debug printf argument length modifier Conflicts: Changelog ffmpeg.c libavcodec/libopusdec.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: const correctness for av_hex_dump / av_hex_dump_logDiego Biurrun2012-10-01
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: Convert some commented-out printf/av_log instances to av_dlog avcodec: Drop silly and/or broken printf debug output avcodec: Drop some silly commented-out av_log() invocations avformat: Convert some commented-out printf/av_log instances to av_dlog avformat: Remove non-compiling and/or silly commented-out printf/av_log statements Remove some silly disabled code. ac3dec: ensure get_buffer() gets a buffer for the correct number of channels Conflicts: libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h264.c libavcodec/h264_parser.c libavcodec/mjpegdec.c libavcodec/motion_est_template.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo_enc.c libavcodec/put_bits.h libavcodec/ratecontrol.c libavcodec/wmaenc.c libavdevice/timefilter.c libavformat/asfdec.c libavformat/avidec.c libavformat/avienc.c libavformat/flvenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Convert some commented-out printf/av_log instances to av_dlogDiego Biurrun2012-10-01
| |
* | lavf: free probe data in case we close before probing finishedMichael Niedermayer2012-09-29
| | | | | | | | | | | | Fixes Ticket1634 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: fill in past dts based on reordered pts once the delay becomes known.Michael Niedermayer2012-09-26
| | | | | | | | | | | | | | | | | | Previously we had ignored the past dts and just filled in from the point where we have had sufficient information. This should fix Ticket1734 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: factorize timestamp shift in update_initial_timestamps()Michael Niedermayer2012-09-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: Add support offset timestamps on muxing.Michael Niedermayer2012-09-26
| | | | | | | | | | | | This allows avoiding negative timestamps. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: fix bug that caused has_decode_delay_been_guessed() to never return !=0Michael Niedermayer2012-09-26
| | | | | | | | | | | | Possibly fixes Ticket1724 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Handle the following type of relative URL correctly:Duncan Salerno2012-09-26
| | | | | | | | | | | | | | | | | | | | http://a/b + //c/d = http://c/d http://a/b?c + ?d = http://a/b?d http://a/b?c/d + /e = http://a/e Updated with feedback from Clément Bœsch Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'Michael Niedermayer2012-09-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7751e4693dd10ec98c20fbd9887233b575034272': ogg: check that the expected number of headers had been parsed libx264: change default to closed gop to match x264cli Use avcodec_free_frame() to free AVFrames. lavf: use a malloced AVFrame in try_decode_frame(). lavc: add avcodec_free_frame(). lavc: ensure extended_data is set properly on decoding lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults() lavc: use av_mallocz to allocate AVFrames. lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults Conflicts: doc/APIchanges doc/examples/decoding_encoding.c libavcodec/utils.c libavcodec/version.h libavfilter/src_movie.c libavformat/oggdec.c libavformat/oggdec.h libavformat/oggparsetheora.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: use a malloced AVFrame in try_decode_frame().Anton Khirnov2012-09-24
| | | | | | | | This allows using avcodec_free_frame() to free it properly.
* | Fix two "skiping" typo.Clément Bœsch2012-09-25
| |
* | lavf: dont add apic streams for demuxers that dont support it.Michael Niedermayer2012-09-25
| | | | | | | | | | | | | | Fixes crash Fixes ticket1730 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/utils: remove loop on AVERROR(EAGAIN) in av_read_frame()Stefano Sabatini2012-09-24
| | | | | | | | | | The loop was introduced in 64d340c62ad5954c1a834df2d26057135e771774, and was likely breaking non blocking reads as it busy loops.
* | lavf/utils: add error check in av_read_frame()Stefano Sabatini2012-09-24
| | | | | | | | | | In particular, fix crash when the input file contains no packets (e.g. an ffmeta input).
* | lavf/find_stream_info: make sure we decode at least one frame for DTSMichael Niedermayer2012-09-23
| | | | | | | | | | | | | | The channel layout at the demuxer layer is commonly wrong and would otherwise be used. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: dont open a decoder at the top of find_stream_info before probing has ↵Michael Niedermayer2012-09-23
| | | | | | | | | | | | | | | | finished It could open the wrong decoder. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: allow using request_probe as a score threshold to accept a codecMichael Niedermayer2012-09-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libx264: add forgotten ; matroskadec: fix a sanity check. matroskadec: only return corrupt packets that actually contain data lavf: zero data/size of the packet passed to read_packet(). ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code ARM: align PIC offset pools to 4 bytes ARM: swap source operands in some add instructions configure: update tms470 detection for latest version lavf probe: prevent codec probe with no data at all seen motion_est: fix use of inline on extern functions Conflicts: libavcodec/motion_est_template.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: zero data/size of the packet passed to read_packet().Anton Khirnov2012-09-21
| |
| * lavf probe: prevent codec probe with no data at all seenJanne Grunau2012-09-20
| | | | | | | | | | | | This occurs with fuzzed mpeg-ts files. set_codec_from_probe_data() is called with a zeroed AVProbeData since no packet made through for specific stream.
* | Remove code that duplicates existing code a few lines down.Reimar Döffinger2012-09-17
| | | | | | | | | | | | This also fixes a potential crash since s->pb can be NULL. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'Michael Niedermayer2012-09-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b': avformat: fix typo in avformat_close_input mp3enc: write Xing TOC mp3enc: support MPEG-2 and MPEG-2.5 in Xing header. mp3enc: downgrade some errors in writing Xing frame to warnings lavf: flush the output AVIOContext in av_write_trailer(). lavf: cosmetics, reformat av_write_trailer(). avio: flush the internal buffer in avio_close() Enhance doc on asyncts audiofilter cmdutils: avoid setting data pointers to invalid values in alloc_buffer() libavcodec: remove av_destruct_packet_nofree() Conflicts: libavcodec/avpacket.c libavformat/mp3enc.c libavformat/nutenc.c libavformat/utils.c libavformat/version.h tests/ref/lavf/voc tests/ref/lavf/voc_s16 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: fix typo in avformat_close_inputLuca Barbato2012-09-15
| | | | | | | | The condition should not be &&.
| * lavf: flush the output AVIOContext in av_write_trailer().Anton Khirnov2012-09-15
| | | | | | | | | | | | | | This is consistent with stdio and is what we want to do in all cases. Fixes a bug in the voc muxer which didn't flush in write_trailer() previously. This is the cause of the change in the test results.
| * lavf: cosmetics, reformat av_write_trailer().Anton Khirnov2012-09-15
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: riff: Add SVQ3 fourcc fate: ac3: add 4.0 and downmix tests configure: x86: improve ebp availability check vorbisdec: ensure FASTDIV denominator is never 1 avformat: refactor avformat_close_input avformat: simplify avformat_close_input Conflicts: configure libavcodec/vorbisdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: refactor avformat_close_inputLuca Barbato2012-09-14
| | | | | | | | Do not crash if the input format is not allocated yet.
| * avformat: simplify avformat_close_inputLuca Barbato2012-09-14
| | | | | | | | avio_close checks by itself for NULL condition.
* | lavf/compute_pkt_fields: only run pts by duration correction if reference ts ↵Michael Niedermayer2012-09-14
| | | | | | | | | | | | is available Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | compute_pkt_fields2: dont interpret max_b_frames of <0 as there being b frames.Michael Niedermayer2012-09-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/avformat_seek_file: fix harmless integer overflowMichael Niedermayer2012-09-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | utils/update_stream_timings: fix division by zeroMichael Niedermayer2012-09-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | compute_pkt_fields: fix harmless integer overflowMichael Niedermayer2012-09-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-14 14:42:00 +0000