76c63bc5d8
Merge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f'
...
* commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f':
lavf: remove a pointless check
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-06 15:34:45 +01:00
3867f3718b
lavf: remove a pointless check
...
AVStream.codec is always non-NULL
2014-01-06 08:21:53 +01:00
863f4c3c71
avformat/utils: fix rounding error accumulation for generated dts in 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 >
2014-01-04 15:10:44 +01:00
5047849584
avformat/utils: fix order of buffers in timestamp update code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-03 23:27:28 +01:00
4bfcedb33f
avformat: dont run update_initial_duration() twice
...
This should avoid floods of first_dts not matching debug messages
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-31 14:13:51 +01:00
ee4e805093
avformat: add ff_get_extradata()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-25 17:14:32 +01:00
d600b18f22
avformat/utils: limit rfps to values larger than fps
...
This avoids some nonsense values being produced by totally corrupted input
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-15 21:43:19 +01:00
f6cd447bf1
avformat/utils: treat flv like mov with timestamp discarding
...
This prevents a regression when using an avparser with flv h264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-15 04:18:13 +01:00
0506cc2cc3
Merge commit '281a40e18f923510f2067d05c5b0cf08cc49dfee'
...
* commit '281a40e18f923510f2067d05c5b0cf08cc49dfee':
lavf: remove an unneeded call to avcodec_get_frame_defaults().
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-12 00:14:21 +01:00
4cbf3eb9e6
Merge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9'
...
* commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9':
Replace all uses of avcodec_free_frame with av_frame_free().
Conflicts:
doc/examples/decoding_encoding.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-11 23:18:51 +01:00
281a40e18f
lavf: remove an unneeded call to avcodec_get_frame_defaults().
...
avcodec_decode_*() resets the frame itself.
2013-12-11 20:39:55 +01:00
eb891b3114
Replace all uses of avcodec_free_frame with av_frame_free().
2013-12-11 20:39:54 +01:00
81c1197494
avformat/utils: Check avcodec_open2() return code in av_find_stream_info()
...
Fixes CID1135750
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-11 20:32:05 +01:00
7f763775aa
avformat/utils: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-07 11:59:53 +01:00
1770da18f7
avformat/utils: reject poorly fitting rfps values earlier
...
This avoids collecting statistics for rfps values that very likely
will get rejected later.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-07 04:20:05 +01:00
1565a9a9e9
avformat/utils: factor rfps calculation out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-05 17:30:13 +01:00
dc1b0a54f9
avformat/utils: provide more IO statistics in debug output at start and end of av_find_streaminfo()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-05 16:09:11 +01:00
f3008f30fb
avformat/utils: move update_wrap_reference() up
...
simplifies code
also remove extra {}
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-04 14:36:36 +01:00
34b16e2d36
avformat/utils: reorder operations in update_wrap_reference()
...
prevents a integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-04 14:36:35 +01:00
394b0c830a
avformat/utils: correct for timestamp wrap earlier
...
This uses dts & pts as reference instead of first_dts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-04 02:18:04 +01:00
d7ead9ad44
avformat/utils: also fix wrapping of start_time in update_initial_timestamps()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-04 02:18:04 +01:00
dd5f925927
avformat/utils: Fix pts_wrap_behavior calculation with negative first_dts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-04 02:18:04 +01:00
ccdfa3e271
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Add missing #includes for *INT64_MAX and *INT64_C
Conflicts:
ffmpeg.c
ffmpeg_filter.c
ffplay.c
libavformat/assdec.c
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-24 05:21:19 +01:00
8f8bc92365
Add missing #includes for *INT64_MAX and *INT64_C
2013-11-23 21:55:52 +01:00
f0f75dfa34
avformat/utils: inject audio skip side data before the side data merge code
...
This ensures that its handled the same way as other side data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-21 03:21:23 +01:00
98fc81b20d
avformat/utils: move side data merge after parser
...
merging before the parser can conflict with the parser, also
future changes depend on it being done later
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-21 01:02:11 +01:00
a8dec360c5
avformat/utils: dont count attached pics toward the probesize
...
Such pics behave more like headers which we also dont count.
Fixes Ticket3146
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-18 03:02:36 +01:00
0ee905e243
Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'
...
* commit '5b9c3b4505206143d85398c1410949319fa1180f':
Replace all instances of avcodec_alloc_frame() with av_frame_alloc().
Conflicts:
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
libavcodec/alacenc.c
libavcodec/libopenjpegenc.c
libavcodec/libvpxenc.c
libavcodec/pcm.c
libavcodec/xbmenc.c
libavcodec/xwdenc.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-16 23:54:10 +01:00
5b9c3b4505
Replace all instances of avcodec_alloc_frame() with av_frame_alloc().
2013-11-16 12:44:20 +01:00
074bae745d
Merge commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878'
...
* 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 <michaelni@gmx.at >
2013-11-14 21:04:44 +01:00
ecf442a58b
lavf: improve support for AVC-Intra files.
...
Generate extradata with SPS/PPS based on container dimensions.
Authors of this commit are: Reimar and Thomas Mundt
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2013-11-14 18:59:39 +01:00
676bc505f7
avformat/utils: disabled debug code to collect format probing statistics
...
This allows collecting statistics on probing scores and the amount of data
probing needed for various files and formats.
For example it can be used to find out which formats tend to need more
data for probing or which files are probed with less certain/lower scores
Reviewed-by: Stefano Sabatini <stefasab@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-11 13:06:36 +01:00
8b73a3f6f6
avformat/utils: never decrease has_b_frames in compute_pkt_fields()
...
The intent of the original check was to increase has_b_frames when
it was incorrectly set to 0. Later codecs allowed larger values
Found-by: divVerent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-03 21:36:10 +01:00
d1c229cdbc
lavf: do not use int to store an int64
2013-11-01 21:01:32 +01:00
4eb49fdde8
lavf: remove unreliable timestamp guessing heuristic
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-29 20:10:41 +01:00
2ba68dd044
lavf: remove unreliable timestamp guessing heuristic
2013-10-28 09:28:19 +01:00
4307026243
avformat/utils: make "first_dts not matching first dts in the queue" message more informative
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-27 17:41:06 +01:00
1e5271a9fd
avformat/utils: do not override pts in h264 when they are provided from the demuxer
...
Fixes Ticket2143
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-27 02:27:45 +02:00
210afae0ba
avformat/utils: Check size argument in ff_add_index_entry()
...
Fixes infinite loop
Fixes Ticket3061
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-24 12:58:09 +02:00
88d4ff4b5f
avformat/utils: Check av_packet_new_side_data() return before using it
...
Fixes null pointer dereference
Fixes CID1108592
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-20 18:33:53 +02:00
a807c68253
avformat: use ff_alloc_extradata()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-10-13 20:13:38 +00:00
3fd79833e2
avformat: add ff_alloc_extradata() helper
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-10-13 20:13:38 +00:00
5082fcc0e2
avformat: add support to force specific AVCodecs
...
previously only codec_ids could be forced, which did not allow
forcing a specific implementation like libopenjpeg vs jpeg2000.
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-02 22:56:03 +02:00
f4aec34805
avformat/utils: pass AVFormatContext to find_decoder()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-02 22:56:03 +02:00
a63b479d11
avformat/utils: factor find_decoder() out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-28 18:11:13 +02:00
ef7e8efc6b
Merge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4'
...
* commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4':
lavf: Avoid setting avg_frame_rate if delta_dts is negative
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-23 14:19:13 +02:00
ce67f442be
lavf: Avoid setting avg_frame_rate if delta_dts is negative
...
This avoids setting avg_frame_rate to invalid (negative)
values.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-09-22 21:02:52 +03:00
49515cb840
avformat: remove duplicate includes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-21 15:36:33 +02:00
15672e832f
avformat/utils: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-20 23:19:29 +02:00
20dfab33f5
Merge commit '5626f994f273af80fb100d4743b963304de9e05c'
...
* commit '5626f994f273af80fb100d4743b963304de9e05c':
avformat: Use av_reallocp() where suitable
Conflicts:
libavformat/avidec.c
libavformat/avienc.c
libavformat/aviobuf.c
libavformat/oggparsevorbis.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-19 11:01:26 +02:00
