virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
39,366 Commits 37 Branches 400 Tags 465 MiB
c44417e15a
Commit Graph

39366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
c44417e15a indeo4: Dont leave tables in random state on errors. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 14:53:17 +02:00
Michael Niedermayer
a74d721876 indeo4: apply correction to eob/esc indexes too 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 14:52:27 +02:00
Michael Niedermayer
92f7f1db42 indeo4: Check for mismatching scan tables 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 14:51:21 +02:00
Michael Niedermayer
a60a4d7041 vc1dec: Fix global array overread. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 10:44:43 +02:00
Michael Niedermayer
8db2935db0 apedec: fix global array overread 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 10:30:44 +02:00
Michael Niedermayer
7a5e587249 apedec: check bits <= 32 
Fixes FPE

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 08:24:31 +02:00
Michael Niedermayer
936951ca5c tm2dec: check total_frames and extradata_size. 
Fixes overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 08:24:31 +02:00
Carl Eugen Hoyos
b17b296369 Fix compilation with hardcoded tables. 2012-03-28 08:06:38 +02:00
Michael Niedermayer
d0dafebb75 tm2: Fix overread of token array. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 07:37:12 +02:00
Michael Niedermayer
11cc209226 lzw(gif): Fix overread 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 07:36:56 +02:00
Michael Niedermayer
96d0494123 lagarith: Fix various issues that lead to out of array reads. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 06:41:40 +02:00
Michael Niedermayer
44bd50f529 lagarith: fix flipped return value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 06:40:14 +02:00
Michael Niedermayer
c30d04cedd lagarithrac: fix length used in ff_lag_rac_init() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 06:26:54 +02:00
Michael Niedermayer
7b453d1c60 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  westwood_vqa: fix SND0 chunk handling
  westwood_vqa: set video stream duration
  raw: forward avpicture_fill() error code in raw_decode().
  build: Do not explicitly add the doc directory to the OBJDIRS list.
  dv: Split off DV video decoder into its own file.
  build: fix RALF decoder standalone compilation, which depends on Golomb code
  configure: Drop stray duplicate entry for --disable-fft from help output.

Conflicts:
	libavcodec/dv.c
	libavcodec/rawdec.c
	libavformat/westwood_vqa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 04:12:24 +02:00
Michael Niedermayer
4a619fcae9 h263dec: Restore w/h values to a consistent state if a change is rejected. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 03:17:48 +02:00
Piotr Bandurski
3c6397404b id3v2: support JPEG APIC with incorrect (image/jpg) MIME type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 02:37:18 +02:00
Paul B Mahol
e4cc9f309e Support FLIC in AVI. 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 02:34:06 +02:00
Michael Niedermayer
e206b51fd3 Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: pause rdft column when ffplay is paused

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 02:16:56 +02:00
Michael Niedermayer
e6093e3640 ffplay: pause rdft column when ffplay is paused 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2012-03-27 21:35:56 +02:00
Paul B Mahol
a0340dfbd7 XBM decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 20:08:41 +02:00
Paul B Mahol
1cd8510912 j2kdec: move ff_j2k_init_tier1_luts() to j2kdec_init() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 19:51:19 +02:00
Tim Nicholson
6fa998c491 Clarify the use of the interl=1|-1 option of the scale filter. 
It is not entirely clear that whilst for width and height only an
expression needs to be provided, for interlace the option must
also be given.

It is also unclear that the default is non interlaced aware scaling.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 19:47:36 +02:00
Thilo Borgmann
7ea948bac3 alsdec: check return values. 2012-03-27 18:06:54 +02:00
Paul B Mahol
55abaa58e5 westwood_vqa: fix SND0 chunk handling 
Version from vqa header does not dictate which sound chunks may
appear in file.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-03-27 11:58:15 -04:00
Paul B Mahol
f0a343f399 westwood_vqa: set video stream duration 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-27 08:54:07 -07:00
Ronald S. Bultje
98df2e2414 raw: forward avpicture_fill() error code in raw_decode(). 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-27 08:54:07 -07:00
Michael Niedermayer
28a613b09b h264: dont mess with chroma planes for grayscale h264. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 15:28:18 +02:00
Michael Niedermayer
dfacef9e73 alsdec: make sure no invalid opt_order stays in the context. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 13:50:41 +02:00
Michael Niedermayer
1acc553e54 vc1dec: dont ignore ff_vc1_parse_frame_header_advs return value 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 13:22:28 +02:00
Michael Niedermayer
e3bd61248f vc1dec: avoid == -1 checks for errors. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 13:21:28 +02:00
Michael Niedermayer
b378a23395 vc1dec: sanity check state used in get_mvdata_interlaced() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 13:20:51 +02:00
Michael Niedermayer
dcd013a535 oma: dont over-read buffer 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 12:52:53 +02:00
Michael Niedermayer
6999f8bcf5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  make av_interleaved_write_frame() flush packets when pkt is NULL
  mpegts: Fix dead error checks
  vc1: Do not read from array if index is invalid.
  targa: convert to bytestream2.
  rv34: set mb_num_left to 0 after finishing a frame

Conflicts:
	libavcodec/targa.c
	libavcodec/vc1data.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 11:59:39 +02:00
Diego Biurrun
8e0b7e2f14 build: Do not explicitly add the doc directory to the OBJDIRS list. 
Now that a documentation generator is built in the doc directory,
this is no longer necessary.  Fixes the Make warning:
Makefile:188: target `doc' given more than once in the same rule.
 2012-03-27 11:15:47 +02:00
Diego Biurrun
d724fe665b dv: Split off DV video decoder into its own file. 2012-03-27 11:15:47 +02:00
Diego Biurrun
9f43fdda3e build: fix RALF decoder standalone compilation, which depends on Golomb code 2012-03-27 11:15:40 +02:00
Diego Biurrun
d7ce1a48a5 configure: Drop stray duplicate entry for --disable-fft from help output. 2012-03-27 11:15:39 +02:00
Jindrich Makovicka
904100e5fc make av_interleaved_write_frame() flush packets when pkt is NULL 
This patch allows the user to force flushing of all queued packets
by calling av_interleaved_write_frame() with pkt set to NULL.

Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-27 11:12:55 +03:00
Compn
ab31db0610 doc: clarify dshow input requirements 2012-03-26 22:18:48 -04:00
Paul B Mahol
0f3886fa7d j2kdec: remove pointless swapping 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 03:32:07 +02:00
Paul B Mahol
ebbf10efb0 j2kdec: vertically align AVCodec members 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 03:29:54 +02:00
Paul B Mahol
75625c6138 j2kdec: Remove useless .pix_fmts. 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 03:29:25 +02:00
Paul B Mahol
ddfa3751c0 j2kdec: convert to bytestream2 API 
Protects against overreads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 03:27:13 +02:00
Alex Converse
c9024a9fd7 mpegts: Fix dead error checks 2012-03-26 17:53:51 -07:00
Mashiat Sarker Shakkhar
95b192de5d vc1: Do not read from array if index is invalid. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-26 17:48:13 -07:00
Ronald S. Bultje
2ad405548b targa: convert to bytestream2. 
Also remove some write-only variables or write-only variable
assignments, remove internal colorspace conversion to native
endianness (that can be done by swscale much more efficiently),
and some cosmetics.
 2012-03-26 17:46:16 -07:00
Michael Niedermayer
a0820eaa8a ffmpeg: fix handling or empty audio packets 
Fixes Ticket1131

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 02:43:40 +02:00
Michael Niedermayer
b62b9df798 ffmpeg: more verbose error messages in case of audio encoding failure. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 02:30:08 +02:00
Michael Niedermayer
8b58f6b5c2 Revert "raw: move buffer size check up." 
This reverts commit cc5dd632ce.
The change was redundant, it has been fixed long ago (422e3a7)

Conflicts:

	libavcodec/rawdec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 02:17:54 +02:00
Ronald S. Bultje
5484170ac7 rv34: set mb_num_left to 0 after finishing a frame 
Prevents running error resilience on a previous frame which will write
to the pic->mb_type[] array of the previous image. The array might
already be re-used for a new image in a subsequent thread, thus cause
two threads to write to the same pic->mb_type[] array, causing a race
condition which can crash in rv34_decode_cbp(), called by
rv34_decode_inter_mb_header() (which accesses mb_type[] twice,
assuming values are maintained, which the race condition breaks).

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-26 16:39:01 -07:00