virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
68,901 Commits 39 Branches 425 Tags
90de28befd88fccb2a4d96d55e1d72eac96c4278
Commit Graph
68901 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer 90de28befd Merge commit '1dd797e3c9f179f957316a0becbec048b42df8aa' 
* commit '1dd797e3c9f179f957316a0becbec048b42df8aa':
  swscale: check memory allocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 21:44:50 +01:00
Michael Niedermayer b20e79dbe9 Merge commit '07a0c0f0005072d115ace61e60f46be68582cc3a' 
* commit '07a0c0f0005072d115ace61e60f46be68582cc3a':
  opt: check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 21:37:48 +01:00
Michael Niedermayer dede2f7fc4 tools/ismindex.c: Use av_realloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 21:08:33 +01:00
Michael Niedermayer a0a7b154bb tools/ismindex: Keep count fields consistent with arrays in case of errors 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 21:07:50 +01:00
Michael Niedermayer d2838f09d6 cmdutils.c: Use av_realloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 17:52:54 +01:00
wm4andMichael Niedermayer 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 369b4cd412 cmdutils: Use 64bit for file size/offset related variable in cmdutils_read_file() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 15:27:17 +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 da0dadbee4 avfilter/buffer: 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 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
Paul B Mahol 145a84717b lavfi: check av_strdup() return value 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-06 10:02:11 +00:00
Dale CurtisandMichael Niedermayer 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 CurtisandMichael Niedermayer 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
Michael Niedermayer a79ac73b63 avfilter/vf_idet: Add analyze_interlaced_flag mode 
This should allow us to insert idet before scale and let scale have interl=-1 as default in that case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 01:21:19 +01:00
Michael Niedermayer 42411a85b7 avfilter/vf_yadif: detect telecine content 
Fixes: yadif with interlaced_flag_switch.mpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 00:31:37 +01:00
wm4andMichael Niedermayer 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
James Almer 08810a8895 x86/flacdsp: remove unneeded ifdeffery 
x86inc can translate r*m into a register or stack on its own

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-01-05 16:29:28 -03: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 0e1c827e84 Merge remote-tracking branch 'origin/master' 
* origin/master:
  libavfilter/vf_blend: do not unconditionally compile both filters

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-05 15:55:47 +01:00
Vittorio Giovara 1dd797e3c9 swscale: check memory allocations 
CC: libav-stable@libav.org
Bug-Id: CID 1257779
 2015-01-05 15:35:39 +01:00
Paul B Mahol 91bdb24400 libavfilter/vf_blend: do not unconditionally compile both filters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-05 14:14:54 +00:00
Vittorio Giovara 07a0c0f000 opt: check memory allocation 
CC: libav-stable@libav.org
Bug-Id: CID 1257771
 2015-01-05 14:58:20 +01:00
wm4andMichael Niedermayer c9151de7c4 avcodec/dvdsubdec: fix out of bounds accesses 
The code blindly trusted buffer offsets read from the file in the RLE
decoder. Explicitly check the offset. Also error out on other RLE
decoding errors.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-05 05:03:49 +01:00
Werner RobitzaandMichael Niedermayer beedeb4399 doc/ffmpeg: mention both ffpreset/avpreset in documentation, remove superfluous example 
ffmpeg looks for both .ffpreset and .avpreset files depending on whether the
-[avsf]pre or -pre option is used. Added two sections for each type of preset
including the rules according to which files are searched.

(Notably, the lookup order is swapped for avpreset files, because it first
looks for <codec>_<arg>.avpreset and then for <arg>.avpreset.)

This removes the section explaining -pre only, which was under "Examples",
where it did not really make sense.

Signed-off-by: Werner Robitza <werner.robitza@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-05 04:34:37 +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 e7521d9771 Merge commit '9f810a9b374e0ff8e2a19fd8a7347afe2933e229' 
* commit '9f810a9b374e0ff8e2a19fd8a7347afe2933e229':
  libavformat: Check for malloc failures in avformat_new_stream

See: a66893ac94
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-05 02:37:17 +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
Michael Niedermayer 1ed5912e81 Merge commit 'f4d4e66a24a5c9497a5b6d3c089ac58089a87428' 
* commit 'f4d4e66a24a5c9497a5b6d3c089ac58089a87428':
  configure: Remap -L to -libpath for msvc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-05 02:20:06 +01:00
Michael Niedermayer 1d41571bbf Merge commit '3e160652219ff4da433f5672ae1e5f4956abb815' 
* commit '3e160652219ff4da433f5672ae1e5f4956abb815':
  cmdutils: update copyright year to 2015.

Conflicts:
	cmdutils.c

See: b8db25a333
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-05 02:10:17 +01:00
Peter RossandMichael Niedermayer 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
Michael Niedermayer 0f931b29f7 Factorize avpriv_mirror() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-05 01:45:49 +01:00
Michael Niedermayer 9bff052b51 avfilter/vf_sab: fix filtering tiny images 
Fixes out of array reads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-05 00:49:42 +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
Martin Storsjö f4d4e66a24 configure: Remap -L to -libpath for msvc 
This allows using libraries that are detected via pkg-config with
msvc. (The libraries themselves may have to be built with MSVC
though.)

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-04 19:57:34 +02:00
Johan AnderssonandMartin Storsjö 3e16065221 cmdutils: update copyright year to 2015. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-04 13:22:25 +02:00
Reynaldo H. Verdejo Pinochet 9975088472 ffserver: reindent rtsp_cmd_setup() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-01-03 20:22:45 -03:00
Reynaldo H. Verdejo Pinochet ac1940b2ba ffserver: reflow rtsp_cmd_setup() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-01-03 20:22:45 -03:00