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
5626f994f2
avformat: Use av_reallocp() where suitable
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2013-09-18 18:28:38 +02:00
e960b3e27e
avformat/utils: Print warning if reallocating probe buffer failed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-17 13:09:24 +02:00
3f760214b4
Merge commit '68b467742092364f9306283f40effde2c12efe08'
...
* commit '68b467742092364f9306283f40effde2c12efe08':
lavf: Make probe_codec return an error code
Conflicts:
libavformat/utils.c
A failure to reallocate should not free the array as it is used
to probe the codec. And failure to reallocate if the following
probe succeeds isnt a fatal error for probe_codec(). Thus this
is only partially merged to ensure probing still is attempted
with the data available.
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-17 12:44:31 +02:00
5c2be81b39
Do not suggest to increase probesize for image2 files.
2013-09-17 00:08:12 +02:00
68b4677420
lavf: Make probe_codec return an error code
...
This allows handling errors from av_realloc properly.
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-09-16 22:28:23 +03:00
2a1c24a267
avformat/utils: use av_realloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 13:38:53 +02:00
8c9d6ee4f2
avformat/utils: functions that add entries should not destroy the whole list on failure
...
The caller does not expect this, and in case of adding new streams would then
not even be able to deallocate them anymore.
This reverts a hunk from "avformat: Use av_reallocp_array() where suitable"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 12:21:21 +02:00
cbe47b1e84
Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa'
...
* commit 'f369b9356c4606cd4d713d60f7db5de119d901fa':
avformat: Use av_reallocp_array() where suitable
Conflicts:
libavformat/asfenc.c
libavformat/gxfenc.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-11 11:23:40 +02:00
f369b9356c
avformat: Use av_reallocp_array() where suitable
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2013-09-10 12:38:32 +02:00
53fb52ac85
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavf: fix the comparison in an overflow check
Conflicts:
libavformat/utils.c
See: a5d67bc796michaelni@gmx.at >
2013-09-08 12:29:07 +02:00
26f027fba1
lavf: fix the comparison in an overflow check
...
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2013-09-07 11:52:40 +02:00
36cd017acd
avformat: make avformat_close_input() more tolerant.
...
The purpose of this commit is to make error management simpler and less
error prone, just like av_free() which is safe with NULL.
2013-09-04 22:06:38 +02:00
e5c338ba7a
avformat/utils: assert position monotonicity in ff_find_last_ts()
...
This ensures that no read timestamp functions finds packets before the search window in ff_find_last_ts()
which could cause an infinite loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-04 01:45:13 +02:00
a5d67bc796
avformat/utils: Fix bitrate overflow check
...
The check added in df33a58e53michaelni@gmx.at >
2013-09-03 14:49:03 +02:00
d07d54fd56
Merge commit 'df33a58e5311ee9a64a573889b883a80e981af7b'
...
* commit 'df33a58e5311ee9a64a573889b883a80e981af7b':
lavf: avoid integer overflow when estimating bitrate
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-03 14:45:53 +02:00
b0ba2bf8c6
Merge commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303'
...
* commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303':
lavf: move a variable declaration to the block where it's used
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-03 14:27:48 +02:00
df33a58e53
lavf: avoid integer overflow when estimating bitrate
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-09-02 19:28:29 +02:00
fab694dd39
lavf: move a variable declaration to the block where it's used
2013-09-02 19:28:19 +02:00
0388203098
avformat/utils: fix duration_fields calculation when need_parsing=0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-01 00:46:14 +02:00
c4810fbe4f
avformat/utils: fix av_probe_input_buffer2() so it returns the probe score
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-08-29 01:15:15 +02:00
e31db621bf
avformat: export probe score
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-08-28 22:18:57 +02:00
a9d1a7c79b
avformat: move PROBE_BUF_M* to internal.h
...
They will be used by the mp3 probe function in the next commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-08-26 00:54:30 +02:00
