virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
74,280 Commits 37 Branches 400 Tags 458 MiB
826790f596
Commit Graph

21 Commits

Author SHA1 Message Date
Michael Niedermayer
839d6bc192 avformat/riffde: Fix integer overflow in bitrate 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:24:20 +02:00
Michael Niedermayer
cd32637741 Merge commit 'f1bdc234370401c032cd85184e93c7c155eb6d62' 
* commit 'f1bdc234370401c032cd85184e93c7c155eb6d62':
  riff: Validate bitrate

Conflicts:
	libavformat/riffdec.c

See: 189420cb56
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:23:42 +02:00
Andreas Cadhalpun
189420cb56 riffdec: prevent negative bit rate 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 16:12:36 +02:00
Michael Niedermayer
ba77fb61f7 Merge commit 'd80811c94e068085aab797f9ba35790529126f85' 
* commit 'd80811c94e068085aab797f9ba35790529126f85':
  riff: Use the correct logging context

Conflicts:
	libavformat/asfdec_o.c
	libavformat/avidec.c
	libavformat/dxa.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/riff.h
	libavformat/riffdec.c
	libavformat/wavdec.c
	libavformat/wtvdec.c
	libavformat/xwma.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-12 15:22:37 +02:00
Andreas Cadhalpun
f1bdc23437 riff: Validate bitrate 2015-07-11 18:45:45 +02:00
Luca Barbato
d80811c94e riff: Use the correct logging context 2015-07-11 18:45:44 +02:00
Michael Niedermayer
6d9dfb1267 Merge commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501' 
* commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501':
  riff: Validate the wav header size before trying to parse it

Conflicts:
	libavformat/riffdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-30 12:59:16 +02:00
Luca Barbato
1b4c468477 riff: Validate the wav header size before trying to parse it 2015-06-28 17:32:40 +02:00
Michael Niedermayer
da06169850 avformat/riffdec: Forward error code from avio_read() in ff_get_guid() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-28 13:04:47 +02:00
Michael Niedermayer
fd3e7447c8 avformat/riffdec: Use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-22 12:03:35 +01:00
Thomas Volkert
00d7555f34 wavdec: RIFX file format support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-18 00:10:35 +01:00
Michael Niedermayer
e74f2be1ed avformat/riffdec: ask for samples with wav header size < 14 
Based on commit by Hendrik Leppkes <h.leppkes@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-30 01:55:36 +01:00
James Almer
d34ec64a22 replace calls to url_feof() with avio_feof() 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-08 00:48:38 +02:00
Michael Niedermayer
d32926db7f avformat/riff: return error code from ff_get_guid() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-12 15:59:15 +01:00
Carl Eugen Hoyos
862174ec83 Move GUID-related objects to riffenc.c and riff.c. 
This simplifies the following eac3-in-wav patch.
 2014-01-29 00:44:59 +01:00
Michael Niedermayer
0b9ca70243 avformat/riffdec: use ff_get_extradata() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-25 17:38:29 +01:00
Paul B Mahol
a807c68253 avformat: use ff_alloc_extradata() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-13 20:13:38 +00:00
Michael Niedermayer
5badcfe220 Merge commit 'd07aa3f02b73ab1371c13ac7898338380ca0932b' 
* commit 'd07aa3f02b73ab1371c13ac7898338380ca0932b':
  riffdec: Add sanity checks for the sample rate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-29 23:41:16 +02:00
Martin Storsjö
d07aa3f02b riffdec: Add sanity checks for the sample rate 
This avoids a division by zero for G726.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-29 19:58:18 +03:00
Michael Niedermayer
0a8f5eb23a Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b' 
* commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b':
  riff: Move demuxing code to a separate file.

Conflicts:
	configure
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 18:30:47 +02:00
Diego Biurrun
255d9c570e riff: Move demuxing code to a separate file. 2013-08-06 11:02:36 +02:00