Michael Niedermayer
0e1bb03cb0
Merge commit ' 01168bf140'
...
* commit '01168bf140
2015-01-07 22:48:24 +01:00
Michael Niedermayer
e2404096b0
avformat/segment: Clear contexts after deallocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-07 22:29:16 +01:00
Michael Niedermayer
2a741baeff
Merge commit ' b3f0465736'
...
* commit 'b3f0465736
2015-01-07 22:15:45 +01:00
Michael Niedermayer
dfffc4aadc
avformat/dvbsub: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-07 17:21:31 +01:00
Luca Barbato
01168bf140
mpeg: Remove unused field
2015-01-07 13:49:10 +01:00
Luca Barbato
b3f0465736
segment: Fix the failure paths
...
A failure in segment_end() or segment_start() would lead to freeing
a dangling pointer and in general further calls to seg_write_packet()
or to seg_write_trailer() would have the same faulty behaviour.
CC: libav-stable@libav.org
Reported-By: luodalongde@gmail.com
2015-01-07 12:36:28 +01:00
Michael Niedermayer
cb03d29dec
Merge commit ' 2a1500fb55'
...
* commit '2a1500fb55
2015-01-07 00:46:47 +01:00
Michael Niedermayer
0d0a905152
Merge commit ' e581e88cbd'
...
* commit 'e581e88cbd
2015-01-07 00:39:44 +01:00
Michael Niedermayer
4009ee3ecc
Merge commit ' 8e03ca2fff'
...
* commit '8e03ca2fff
2015-01-07 00:31:05 +01:00
Martin Storsjö
2a1500fb55
movenc: Fix a typo in a comment
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-06 19:47:18 +02:00
Martin Storsjö
e581e88cbd
movenc: Readd an accidentally removed condition
...
This was removed accidentally as part of 847bf598
2015-01-06 19:47:09 +02:00
Justin Ruggles
8e03ca2fff
isom: add 'mp1v' fourcc
...
As referenced in the CoreMedia API docs.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-01-06 17:05:53 +01:00
wm4
ea7af58fc6
avformat/id3v2: support USLT tags
...
I think this turned out pretty terrible. There's no good way to add new
custom tags that write to AVFormatContext->metadata.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 16:39:52 +01:00
Michael Niedermayer
bbfca8e84b
avformat/utils: Clear pointer in ff_alloc_extradata() to avoid leaving a stale pointer in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 15:07:50 +01:00
Michael Niedermayer
59ca6e2586
avformat/hlsproto: Use av_freep, to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 15:07:50 +01:00
Michael Niedermayer
6e70e4aca5
avformat/matroskadec: Use av_freep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 15:07:50 +01:00
Michael Niedermayer
383c6a3a07
avformat/mov: use av_freep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 15:07:50 +01:00
Michael Niedermayer
62eafb6a0d
avformat/mov: Clear array to prevent potential out of array read from av_dlog()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 15:07:50 +01:00
Dale Curtis
3ebd76a9c5
mov: Fix negative size calculation in mov_read_default().
...
The previous code assumed if an atom was marked with a 64-bit
size extension, it actually had that data available. The new
code verfies there's enough data in the atom for this to be
done.
Failure to verify causes total_size > atom.size which will
result in negative size calculations later on.
Found-by: Paul Mehta <paul@paulmehta.com>
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 05:23:45 +01:00
Michael Niedermayer
3859868c75
avformat/mov: fix integer overflow in mov_read_udta_string()
...
Found-by: Paul Mehta <paul@paulmehta.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 04:44:16 +01:00
Dale Curtis
db42d93a61
mov: Fix overflow and error handling in read_tfra().
...
Under abnormal conditions the item_count may exceed the max
allocation size on 32-bit systems, this causes the allocated
size to overflow and become too small for the given count.
Additionally, if av_reallocp() fails its allocation, the
fragment_index_count is not correctly decremented.
Ensuring further havoc may be wrought, the error code for
read_tfra() is not checked upon return.
Found-by: Paul Mehta <paul@paulmehta.com>
positive return code and use of _array functions by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 04:44:16 +01:00
wm4
bd78010407
avformat/id3v1: strip trailing whitespace
...
ID3v1 fields have a fixed size, and they are padded either with zeros,
or with spaces. Handle the latter case, instead of putting strings with
trailing spaces into the AVDictionary.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-05 20:52:51 +01:00
Michael Niedermayer
d02d4d0457
avformat/dvbsub: increase probe score
...
Ive not found a single false positive after some moderate testing with
probetest
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-05 17:40:16 +01:00
Michael Niedermayer
b0826b8324
avformat/dvbsub: fix indent after previous commit
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-05 17:40:16 +01:00
Michael Niedermayer
3bf2b376e6
avformat/dvbsub: check for 0xf0 earlier in probe, 30% faster
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-05 17:40:09 +01:00
Michael Niedermayer
fb22e5ae45
Merge commit ' 46808fdf04'
...
* commit '46808fdf04
2015-01-05 02:45:34 +01:00
Michael Niedermayer
dd4de4a987
Merge commit ' c4aa0f865f'
...
* commit 'c4aa0f865f
2015-01-05 02:27:00 +01:00
Peter Ross
f1098eb97d
avformat/aiffdec: only read codec tag when there is space in header
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-05 01:45:49 +01:00
Michael Niedermayer
ce1e10aa24
avformat/utils: add dvbsub to set_codec_from_probe_data()
...
Fixes part of ticket 4221
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-05 01:45:49 +01:00
Michael Niedermayer
e313735d7d
avformat: add dvbsub demuxer
...
This is needed for probing some dvbsub streams in mpegts
Fixes part of ticket4221
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-05 01:45:49 +01:00
Michael Niedermayer
d1781fd786
avformat/rawdec: Add FF_DEF_RAWSUB_DEMUXER
...
This is similar to the corresponding audio and video macros
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-05 01:45:49 +01:00
Michael Niedermayer
dc265e2b6b
avformat/rawdec: Make ff_raw_data_read_header() non static
...
This is similar to the raw video read header
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-05 01:45:49 +01:00
Michael Niedermayer
58721388b8
avformat/flvenc: omit more metadata elements with specific meaning
...
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-05 01:45:49 +01:00
Martin Storsjö
46808fdf04
movenc: Enable editlists by default if delay_moov is enabled
...
Being able to write editlists properly is one of the main points
in the delay_moov flag.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-04 20:04:36 +02:00
Martin Storsjö
9f810a9b37
libavformat: Check for malloc failures in avformat_new_stream
...
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-04 20:04:36 +02:00
Martin Storsjö
c4aa0f865f
libavformat: Remove a misleading/incorrect comment
...
This comment can be traced back to the initial commit from 2001,
and it seemed to be misleading/incorect already back then. (It
was used for normal, non-raw file formats already then.)
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-04 20:04:33 +02:00
Michael Niedermayer
d56b0984f9
avformat/westwood_vqa: Remove unneeded cast
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03 21:03:44 +01:00
Michael Niedermayer
0daf60140b
avformat/movenc: fix DELAY_MOOV
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03 17:45:12 +01:00
Michael Niedermayer
4bcb58b3ad
Merge commit ' f2ad1495f2'
...
* commit 'f2ad1495f2
2015-01-03 13:24:57 +01:00
Michael Niedermayer
3be67f33a5
Merge commit ' 7a1a63e34f'
...
* commit '7a1a63e34f
2015-01-03 04:26:20 +01:00
Michael Niedermayer
983778f1f6
Merge commit ' c5e7ea13d2'
...
* commit 'c5e7ea13d2
2015-01-03 04:08:09 +01:00
Michael Niedermayer
b0ba8a23b6
Merge commit ' b3b0b35db2'
...
* commit 'b3b0b35db2
2015-01-03 04:01:34 +01:00
Michael Niedermayer
f38e2bcb72
Merge commit ' 847bf5988f'
...
* commit '847bf5988f
2015-01-03 03:13:16 +01:00
Michael Niedermayer
504267fb56
avformat/movenc: Use cluster timestamps when available in edts
...
Also print both if they differ
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03 02:47:35 +01:00
Michael Niedermayer
0506f687e8
Merge commit ' c725faebda'
...
* commit 'c725faebda
2015-01-03 01:38:58 +01:00
Martin Storsjö
f2ad1495f2
avisynth: Use RTLD_LOCAL instead of RTLD_GLOBAL
...
There shouldn't be any need to add the loaded libraries to the global
symbol namespace.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-03 02:30:03 +02:00
Michael Niedermayer
68a06a244c
Merge commit ' 724cbea719'
...
* commit '724cbea719
2015-01-03 01:25:30 +01:00
Michael Niedermayer
7ca10d10aa
Merge commit ' 355d01a1bf'
...
* commit '355d01a1bf
2015-01-03 01:18:54 +01:00
Martin Storsjö
7a1a63e34f
dashenc: Use pts for MPD timeline timestamps
...
This should be more correct. This also should give more sensible
switching between video streams with different amount of b-frame
delay.
The current dash.js release (1.2.0) fails to start playback of
such files from the start (if the start pts is > 0), but this has
been fixed in the current git version of dash.js.
Also enable the use of edit lists, so that streams in many cases
start at pts=0.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-03 01:22:09 +02:00
Martin Storsjö
c5e7ea13d2
dashenc: Use delay_moov
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-03 01:20:55 +02:00
