virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
68,976 Commits 37 Branches 400 Tags 460 MiB
6243845036
Commit Graph

16591 Commits

Author SHA1 Message Date
Peter Ross
6243845036 avformat/aiffdec: improve readability 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-09 00:50:45 +01:00
Carl Eugen Hoyos
cd3405282c Skip Exif data when auto-detecting jpeg images. 2015-01-09 00:30:02 +01:00
Michael Niedermayer
d1d8f866b5 avformat/mlvdec: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 20:19:20 +01:00
Michael Niedermayer
edeaf6f3a4 avformat/mlvdec: Simplify code by using avio_closep() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 20:19:20 +01:00
Michael Niedermayer
07e4ed5637 avformat/mov: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 20:19:20 +01:00
Michael Niedermayer
f9ddaa35c7 avformat/rtpenc_chain: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 20:19:20 +01:00
Michael Niedermayer
e360d030b3 avformat/rtsp: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 20:19:20 +01:00
Michael Niedermayer
bf3126db6a avformat/hlsenc: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:51:04 +01:00
Michael Niedermayer
26c72d2941 avformat/img2dec: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:50:34 +01:00
Michael Niedermayer
50bb9b87ab avformat/img2enc: Use avio_closep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:50:07 +01:00
Michael Niedermayer
b565fd4464 avformat/hdsenc: Simplify code by using avio_closep() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-08 14:13:36 +01:00
Michael Niedermayer
0e1bb03cb0 Merge commit '01168bf1405ddbf671f1074a927b951b8777adbb' 
* commit '01168bf1405ddbf671f1074a927b951b8777adbb':
  mpeg: Remove unused field

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 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 'b3f04657368a32a9903406395f865e230b1de348' 
* commit 'b3f04657368a32a9903406395f865e230b1de348':
  segment: Fix the failure paths

Conflicts:
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 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 '2a1500fb552364488cfbee3e29e296788a3a6bdd' 
* commit '2a1500fb552364488cfbee3e29e296788a3a6bdd':
  movenc: Fix a typo in a comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 00:46:47 +01:00
Michael Niedermayer
0d0a905152 Merge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f' 
* commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f':
  movenc: Readd an accidentally removed condition

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-07 00:39:44 +01:00
Michael Niedermayer
4009ee3ecc Merge commit '8e03ca2fff40ce065ea5a516200e777c96cd785e' 
* commit '8e03ca2fff40ce065ea5a516200e777c96cd785e':
  isom: add 'mp1v' fourcc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 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. This could cause
groundless warning logging.

Signed-off-by: Martin Storsjö <martin@martin.st>
 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 '46808fdf04ab113df374157b90b506eb3110daf2' 
* commit '46808fdf04ab113df374157b90b506eb3110daf2':
  movenc: Enable editlists by default if delay_moov is enabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-05 02:45:34 +01:00
Michael Niedermayer
dd4de4a987 Merge commit 'c4aa0f865fb2c3b28a309d1bb27fd1c24b75ba28' 
* commit 'c4aa0f865fb2c3b28a309d1bb27fd1c24b75ba28':
  libavformat: Remove a misleading/incorrect comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 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 'f2ad1495f23376ce61542967f4fc14205f284d40' 
* commit 'f2ad1495f23376ce61542967f4fc14205f284d40':
  avisynth: Use RTLD_LOCAL instead of RTLD_GLOBAL

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-03 13:24:57 +01:00