aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | estimate_timings_from_pts: Execute max 1 iteration extra to find more than 1 ↵Michael Niedermayer2014-05-161-10/+15
| | | | | | | | | | | | duration Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | estimate_timings_from_pts: Try to get the duration for all streamsGaullier Nicolas2014-05-161-4/+15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | estimate_timings_from_pts: simplify filesize end checkMichael Niedermayer2014-05-161-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | estimate_timings_from_pts: Also consider packet durationGaullier Nicolas2014-05-161-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | estimate_timings_from_pts: Warn about A/V streams for which no duration ↵Gaullier Nicolas2014-05-161-0/+14
| | | | | | | | | | | | could be set Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: if the id3 tag is too large for data after it to become ↵Michael Niedermayer2014-05-121-2/+5
| | | | | | | | | | | | available, use the full AVPROBE_SCORE_EXTENSION if extension matches Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: limit probe score in the id3 case only if there is a chance ↵Michael Niedermayer2014-05-121-1/+3
| | | | | | | | | | | | | | | | that data after the id3 tag will become available Fixes ticket3327 (sample.mp3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: fix const warningsMichael Niedermayer2014-05-071-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Set the average frame rate from the r_frame_rate if the ↵Michael Niedermayer2014-04-281-0/+9
| | | | | | | | | | | | | | | | stream appears to be cfr This permits the average fps to be set in more cases Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Ensure that average fps is probed if requested by the user ↵Michael Niedermayer2014-04-281-2/+3
| | | | | | | | | | | | even if tb_unreliable() is 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: prevent r frame rate from being set larger than 1/tbMichael Niedermayer2014-04-281-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: add gif to tb_unreliable()Michael Niedermayer2014-04-281-0/+1
| | | | | | | | | | | | This improves the used timebases when gif is the source Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31'Michael Niedermayer2014-04-221-6/+0
|\| | | | | | | | | | | | | * commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31': lavf: do not use the parser duration for video Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: do not use the parser duration for videoAnton Khirnov2014-04-221-6/+0
| | | | | | | | | | The parser has no way of knowing video duration, and therefore no video parsers set it.
* | avformat: Fix decoder search in find stream infoMichael Niedermayer2014-04-211-3/+5
| | | | | | | | | | | | Fixes Ticket3548 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_id3v2_read: add option to limit ID3 magic number searchPeter Ross2014-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 ' chunk tag. If such chunks are stored sequentially, it is possible for the ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g. [1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...] [2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...] Fixes ticket #3530. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: fix typoMichael Niedermayer2014-04-151-1/+1
| | | | | | | | | | Found-by: reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add av_format_inject_global_side_data(), and disable it by defaultMichael Niedermayer2014-04-151-3/+16
| | | | | | | | | | | | | | | | | | | | 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 <michaelni@gmx.at>
* | avformat/utils: reinject global side data on seeksMichael Niedermayer2014-04-131-0/+2
| | | | | | | | | | | | This fixes ffplay replaygain with seeking Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: factorize if()Michael Niedermayer2014-04-131-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>