generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
41,262 Commits 24 Branches 241 Tags 173 MiB
44c10168cf
Commit Graph

41262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
44c10168cf mpc8: fix channel checks 
fix heap array overflow

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-03 17:40:30 +02:00
Michael Niedermayer
a5ad3c2382 av_get_audio_frame_duration: fix FPE 
Fixes ticket1392

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-03 17:12:57 +02:00
Michael Niedermayer
6df1cfa7e4 mace: check channel count, fixes FPE 
Fixes ticket1391

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-03 15:01:34 +02:00
Michael Niedermayer
cc229d4e83 h263: disable loop filter with lowres 
Fixes ticket1212

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-03 15:01:34 +02:00
Carl Eugen Hoyos
169dae8114 Unconditionally compile init_stream() in bintext. 
Fixes compilation of xbin, adf and idf demuxer if
bintext demuxer was disabled.

Fixes ticket #1399
 2012-06-03 14:47:26 +02:00
Nicolas George
7f17f4f1a7 af_amerge: use the buferqueue API. 2012-06-03 10:04:01 +02:00
Nicolas George
2f2d47ab63 af_astreamsync: set samples rate in query_formats. 2012-06-03 10:04:01 +02:00
Michael Niedermayer
c983ca5b90 mpegtsenc: zero pointers after freeing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-03 03:44:16 +02:00
Michael Niedermayer
328e203ca9 mpegts_audio_write: fix potential integer overflow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-03 03:43:40 +02:00
Michael Niedermayer
f67309cabe Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegtsenc: Support LATM packetization for AAC
  adtsenc: Don't expose the muxer internals to the rest of lavf
  mpegtsenc: use AVFormatContext for AAC packetization
  mpegtsenc: use AVERROR() for return codes

Conflicts:
	libavformat/adts.h
	libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-03 02:56:52 +02:00
Mans Rullgard
a128b310ef configure: add --enable/disable-random option 
This allows creating random configurations which is useful for
testing purposes.

Signed-off-by: Mans Rullgard <mans@mansr.com>

Conflicts:

	configure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-03 02:08:16 +02:00
Mans Rullgard
d0f34c96b1 aacsbr: remove unused variables 2012-06-03 01:53:36 +02:00
Michael Niedermayer
0e3cec9f7d aacsbr: optimize sine level addition 
Based-on commit by Måns Rullgård <mans@mansr.com>

original:   1424 decicycles in phi, 1024 runs, 0 skips
mans code:  1104 decicycles in phi, 1024 runs, 0 skips
this change: 734 decicycles in phi, 1024 runs, 0 skips

mans code:   1 file changed, 20 insertions(+), 10 deletions(-)
this change: 1 file changed, 10 insertions(+), 6 deletions(-)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-03 01:53:10 +02:00
Jindrich Makovicka
2439bd8681 mpegtsenc: Support LATM packetization for AAC 
This adds the avoption mpegts_flags and converts the existing
resend_headers option into a flag, keeping the old option as
fallback for now.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-03 01:20:41 +03:00
Jindrich Makovicka
485d3ea064 adtsenc: Don't expose the muxer internals to the rest of lavf 
This isn't required any longer, when the mpegts muxer uses it
as a proper chained muxer.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-03 01:18:11 +03:00
Jindrich Makovicka
b1c56eabe8 mpegtsenc: use AVFormatContext for AAC packetization 
This removes the dependency on adts.c internals, and simplifies
adding other packetization formats.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-03 01:17:48 +03:00
Jindrich Makovicka
d1a3a3d4b2 mpegtsenc: use AVERROR() for return codes 
Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-03 01:13:35 +03:00
Michael Niedermayer
e95233789c mpc7: fix handling of last frame 
Fixes heap buffer overflow
Fixes ticket1393

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 23:43:31 +02:00
Michael Niedermayer
e0eaf10049 oggdec: fix regression that caused reading the whole file during open 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 22:50:40 +02:00
Michael Niedermayer
82570d2f09 png_parser: dont falsely mark frames as keyframes 
Fixes Ticket1381

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 21:12:20 +02:00
Michael Niedermayer
5665674b55 lavf: use input keyframe flag when muxer does not provide keyframe flags. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 21:11:43 +02:00
Michael Niedermayer
b3675f890a bink: fix out of reference frame read 
Fixes Ticket1374

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 19:56:10 +02:00
Michael Niedermayer
1bf22c3a8f Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: remove VideoPicture pix_fmt and use frame pixel format instead
  ffplay: only request 4 or 6 channels from SDL, if SDL version is at least 1.2.8
  ffplay: add pause audio feature in the middle of a packet
  ffplay: remove VideoPicture duration field

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 17:06:09 +02:00
Michael Niedermayer
fb4e434cfb h264: log debug output for slightly truncated streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 15:37:20 +02:00
Michael Niedermayer
cd0f9f00a2 h264: try to better handle h264 streams that are slightly truncated 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 15:36:50 +02:00
Michael Niedermayer
debbcfae60 bmv: fix apparent sign error in the frame_off check 
Fixes part of Ticket1373

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 04:18:13 +02:00
Michael Niedermayer
679c578cb8 bmv: fix integer overflows in vlc decoder. 
Fixes part of Ticket1373

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Based-on-patch-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 04:18:13 +02:00
Michael Niedermayer
9ebe6e3910 ffv1: fix integer overflow in quant table initialization 
Fixes part of Ticket1372

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 02:37:36 +02:00
Michael Niedermayer
97c281d5b7 ffv1: fix crash caused by version becoming inconsistent 
Fixes part of Ticket1372

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 02:30:55 +02:00
Michael Niedermayer
0bae6661cd fraps: fix version 0/1 input data size check. 
Fixes array overread.
Fixes Ticket1371

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 23:22:54 +02:00
Michael Niedermayer
f23a2418fb wmv1: check that the input buffer is large enough 
Fixes null ptr deref
Fixes Ticket1367

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 23:22:54 +02:00
Clément Bœsch
fd0c83c666 ffprobe: add flat output format. 2012-06-01 21:06:06 +02:00
Clément Bœsch
db839544d6 ffprobe/xml: use writer multiple_sections instead of local context variable. 2012-06-01 20:52:30 +02:00
Clément Bœsch
2248db946c ffprobe: move packets_and_frames work to writer context. 2012-06-01 20:52:30 +02:00
Carl Eugen Hoyos
7980a260a9 Let ffmpeg select the null and anull filters. 
They are needed since 16e25ef.
 2012-06-01 20:10:43 +02:00
Michael Niedermayer
fbc5e0fae1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  http: Add the url_shutdown function for https, too
  http: Simplify code by removing a local variable
  http: Clear the old URLContext pointer when closed
  tcp: Try enabling SO_REUSEADDR when listening
  tcp: Check the return values from bind and accept
  avisynth: Make sure the filename passed to avisynth is in the right code page

Conflicts:
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 19:59:39 +02:00
Michael Niedermayer
0d83edaba9 dct-test: give emms a memory clober. 
Without this, the compiler in theory could attempt to keep
things in float registers across the emms which would cause
bad things to happen.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 19:16:14 +02:00
Michael Niedermayer
461030a7ac dct-test: perform emms before gettime(). 
This fixes the hypothetical case of a gettime implementation using floats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 19:15:24 +02:00
Michael Niedermayer
9758b1cb88 fate: enable fate-mapchan-6ch-extract-2-downmix-mono 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 18:44:07 +02:00
Michael Niedermayer
d43812e235 ffmpeg: move pan filter insertion up. 
This fixes one (disabled) fate test.

Thanks-to: ubitux to pointing at the odd filter order and stereo/mono messup
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 18:43:13 +02:00
Martin Storsjö
dbaf79c9d7 http: Add the url_shutdown function for https, too 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-01 18:38:31 +03:00
Martin Storsjö
5952564185 http: Simplify code by removing a local variable 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-01 18:38:29 +03:00
Martin Storsjö
3cbcfa2dec http: Clear the old URLContext pointer when closed 
This fixes issues with opening http urls that have authentication
or redirects, introduced in commit e999b641.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-01 18:38:28 +03:00
Michael Niedermayer
0766b6e3ec rv20: fix lowres out of array read 
Fixes Ticket1239

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 17:07:07 +02:00
Michael Niedermayer
febc013dc5 yopdec: check frame oddness to be within supported limits 
Fixes Ticket1365

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 15:52:20 +02:00
Michael Niedermayer
b6fdf8dea7 yopdec: check that palette fits in the packet 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 15:51:50 +02:00
Michael Niedermayer
f218121a4d http: use ffurl_closep() 
Fixes Ticket1383

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 14:48:17 +02:00
Michael Niedermayer
edf96d631c url: add ffurl_closep() which also sets the context pointer to NULL 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 14:47:30 +02:00
Michael Niedermayer
f89aa6751c lavf: use av_freep() in ffurl_close() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 14:40:05 +02:00
Martin Storsjö
2dbb8cc6a3 tcp: Check the return values from bind and accept 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-06-01 14:25:15 +02:00