aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | avformat/utils: Inject global side data into first packet.Michael Niedermayer2014-04-131-0/+19
| | | | | | | | | | | | This fixes replaygain handling in ffplay and probably other applications. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/utils: fix mem leakLukasz Marek2014-04-101-0/+2
| | | | | | | | | | | | | | | | | | Calling avformat_free_context() right after avformat_alloc_output_context2() leaved option's default values not freed. Options were freed only in av_write_trailer(). Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Show stream number when warning about stream without start time.Carl Eugen Hoyos2014-04-051-1/+1
| |
* | libavformat/utils.c: av_pkt_dump_log2: use const pointersRoman Fietze2014-04-031-4/+4
| | | | | | | | | | | | | | Use const pointers to AVPacket and AVStream. Signed-off-by: Roman Fietze <roman.fietze@telemotive.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'Michael Niedermayer2014-03-241-0/+6
|\| | | | | | | | | | | | | | | | | | | | | * commit '25b32586566f285d797737863c97a1c5c9c84e2b': lavf: add an AVStream field for exporting stream-global side data Conflicts: libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add an AVStream field for exporting stream-global side dataAnton Khirnov2014-03-241-1/+7
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-131-4/+6
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: Match stream id Conflicts: cmdutils.c doc/fftools-common-opts.texi See: ea07063fd82686af3fabb45e5ed10aa48d084d61 Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf'Michael Niedermayer2014-03-121-1/+3
|\| | | | | | | | | | | | | | | | | | | | | * commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf': avformat: Report the duration analysis reached Conflicts: libavformat/utils.c See: 8529f9b36b7c1b8f2cb36ba2709983517c4b6458 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Report the duration analysis reachedLuca Barbato2014-03-111-1/+2
| |
* | avformat/utils: detect MPEG streams with faulty DTS and discard affected DTSMichael Niedermayer2014-03-031-0/+25
| | | | | | | | | | | | Fixes issue2.ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: compute_pkt_fields: Fix DTS for the case where has_b_frames ↵Michael Niedermayer2014-02-221-4/+46
| | | | | | | | | | | | | | | | is too large but the correct one is constant Fixes issue1.m2ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: reset pts_buffer in estimate_timings_from_pts()Michael Niedermayer2014-02-221-0/+4
| | | | | | | | | | | | This fixes the first few dts after find_stream_info Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: factorize h264/hevc checks out in compute_pkt_fields()Michael Niedermayer2014-02-221-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not warn about missing start time for unknown streams.Carl Eugen Hoyos2014-02-211-1/+3
| |
* | Only complain about missing frame rate for video streams.Carl Eugen Hoyos2014-02-211-0/+1
| |
* | avformat/utils: av_guess_frame_rate() favor avg_frame_rate if r_frame_rate ↵Michael Niedermayer2014-02-191-2/+8
| | | | | | | | | | | | | | | | | | has a comparably unlikely value Fixes Ticket3399 Fixes Ticket2958 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: skip the MPEG-2 style dts/pts code for HEVCMichael Niedermayer2014-02-141-2/+4
| | | | | | | | | | | | | | | | This extends the exception from H264 to H264 + HEVC Fixes Ticket3385 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: allow av_find_best_stream to return AV_DISPOSITION_*_IMPAIRED ↵Marton Balint2014-02-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | wanted_streams Previously these type of streams were not returned even if wanted stream was set to a stream of such. Now they are only skipped if they are not wanted streams. Fixes ffplay -sst <stream number> out.ts where stream number is a *_IMPAIRED stream. Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74'Michael Niedermayer2014-02-041-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '33c859c142ef3f49b7a6227014ad92a680cf4d74': lavf: ignore attachment streams for interleaving purposes Conflicts: libavformat/avformat.h libavformat/internal.h libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: ignore attachment streams for interleaving purposesAnton Khirnov2014-02-041-0/+1
| | | | | | | | Those streams should never get any packets by definition.
* | libavformat/utils.c: Cosmetics: Fix incorrect comma placementStåle Kristoffersen2014-02-031-1/+1
| |
* | avformat: use AVPROBE_SCORE_STREAM_RETRY, instead of AVPROBE_SCORE_RETRY - 1Michael Niedermayer2014-02-021-1/+1
| | | | | | | | | | | | This makes the code clearer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: dvd still frames read thru libdvdnav ended up in internal ↵Voyager12014-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | lavf buffer This is the solution we've been using in XBMC for over 2 years for dvd still frames. The problem is that the demuxer asks for probing of the codec in the mpeg stream. This causes lavf to read the whole menu structure into internal buffers. After which, it won't read from input stream anymore and no events triggers. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Auto-detect hevc in mpeg-ts.Ståle Kristoffersen2014-01-311-0/+1
| | | | | | | | | | | | Fixes decoding of files without PMT/PAT. Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* | Merge commit '78987a88a88b28d93d03ed6c228bcb33f178444f'Michael Niedermayer2014-01-311-1/+1
|\| | | | | | | | | | | | | * commit '78987a88a88b28d93d03ed6c228bcb33f178444f': lavf: include 60 fps in guessed standard frame rates Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: include 60 fps in guessed standard frame ratesJanne Grunau2014-01-311-2/+2
| | | | | | | | | | Due to what looks like an off-by-one error 60 * 12 * 1001 / 12 * 1001 is not tested as standard frame rate in avformat_find_stream_info().
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-291-31/+23
|\| | | | | | | | | | | | | * qatar/master: avformat: utils: Refactor duplicated PRINT macro Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: utils: Refactor duplicated PRINT macroDiego Biurrun2014-01-291-31/+23
| |
* | lavd: add avdevice_dev_to_app_control_message APILukasz Marek2014-01-271-0/+2
| | | | | | | | | | | | New API allows to send messages from devices to application. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | Merge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'Michael Niedermayer2014-01-261-859/+998
|\| | | | | | | | | | | | | | | | | | | * commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654': avformat: utils: K&R formatting cosmetics Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: utils: K&R formatting cosmeticsDiego Biurrun2014-01-261-776/+910
| | | | | | | | Also adjust some comment wording / spelling and reorder header #includes.
| * lavf: make av_probe_input_buffer more robustAnton Khirnov2014-01-131-2/+1
| | | | | | | | | | | | | | Always use the actually read size as the offset instead of making possibly invalid assumptions. Addresses: CVE-2012-6618
* | AVFormatContext: add metadata_header_padding fieldJames Darnley2014-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This field is used to store the number of bytes that should be written as padding to a metadata header of a file. For example: - The FLAC format's METADATA_BLOCK_PADDING [1] - The ID3v2 tag format's padding [2] [1] http://xiph.org/flac/format.html#metadata_block_padding [2] http://id3.org/id3v2.3.0#ID3v2_overview Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Never favour an audio stream with 0 channels in av_find_best_stream().Carl Eugen Hoyos2014-01-161-0/+2
| | | | | | | | Fixes ticket #3311.
* | avformat/utils: av_probe_input_buffer2 decrease difference to libavMichael Niedermayer2014-01-141-2/+1
| | | | | | | | | | | | | | | | This removes the initialization of 2 unused fields The change was part of c1868e7ee7b07b40a0fe15f50df89fe499a01a50 but wasnt merged as the fields could still be used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils/av_probe_input_buffer2: fix buffer passed to ↵Michael Niedermayer2014-01-131-1/+1
| | | | | | | | | | | | ffio_rewind_with_probe_data() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils/av_probe_input_buffer2: fix offset checkMichael Niedermayer2014-01-131-3/+2
| | | | | | | | | | | | The check could fail if avio_read() read less than requested Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils/av_probe_input_buffer2: Fix pd.buf_sizeMichael Niedermayer2014-01-131-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8b76362836f3c373c3aadc544522edcbef16dd5f'Michael Niedermayer2014-01-131-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '8b76362836f3c373c3aadc544522edcbef16dd5f': lavf: use a fixed width type Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: use a fixed width typeAnton Khirnov2014-01-131-1/+1
| | | | | | | | It's shorter and more consistent with the rest of the code.
| * lavf: simplify handling of offset in av_probe_input_buuffer()Anton Khirnov2014-01-131-6/+4
| |
* | Merge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f'Michael Niedermayer2014-01-061-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f': lavf: remove a pointless check Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove a pointless checkAnton Khirnov2014-01-061-2/+1
| | | | | | | | AVStream.codec is always non-NULL
* | avformat/utils: fix rounding error accumulation for generated dts in ↵Michael Niedermayer2014-01-041-2/+5
| | | | | | | | | | | | | | | | | | compute_pkt_fields() This only updates the case where there is no B frame reordering delay. Tested-by: Anssi Hannula <anssi.hannula@iki.fi> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: fix order of buffers in timestamp update codeMichael Niedermayer2014-01-031-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: dont run update_initial_duration() twiceMichael Niedermayer2013-12-311-0/+3
| | | | | | | | | | | | This should avoid floods of first_dts not matching debug messages Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add ff_get_extradata()Michael Niedermayer2013-12-251-0/+16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: limit rfps to values larger than fpsMichael Niedermayer2013-12-151-0/+6
| | | | | | | | | | | | This avoids some nonsense values being produced by totally corrupted input Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: treat flv like mov with timestamp discardingMichael Niedermayer2013-12-151-1/+2
| | | | | | | | | | | | This prevents a regression when using an avparser with flv h264 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '281a40e18f923510f2067d05c5b0cf08cc49dfee'Michael Niedermayer2013-12-121-1/+0
|\| | | | | | | | | | | | | * commit '281a40e18f923510f2067d05c5b0cf08cc49dfee': lavf: remove an unneeded call to avcodec_get_frame_defaults(). Merged-by: Michael Niedermayer <michaelni@gmx.at>