generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
54,650 Commits 24 Branches 241 Tags 173 MiB
5698f6bd73
Commit Graph

24700 Commits

Author SHA1 Message Date
Michael Niedermayer
5698f6bd73 Merge commit '04e9853a210e07b1a150aa2b8e9af0aa3601ff21' 
* commit '04e9853a210e07b1a150aa2b8e9af0aa3601ff21':
  wmavoice: return meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 11:33:19 +02:00
Michael Niedermayer
56090b5b80 Merge commit '3865ba7b21aef5d60183719e238361ec8797ab5a' 
* commit '3865ba7b21aef5d60183719e238361ec8797ab5a':
  iff: K&R formatting cosmetics

Conflicts:
	libavcodec/iff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 11:12:48 +02:00
Michael Niedermayer
15cee5e562 mjpegdec: Fix used quant index for gbr 
Fixes Ticket1651

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 02:31:58 +02:00
Michael Niedermayer
94e86ae15a mjpegdec: initialize source variables before gbr remap 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 02:31:58 +02:00
Paul B Mahol
4511973901 wmalosslessdec: do not set avctx->coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 19:11:12 +00:00
Michael Niedermayer
8f09957194 avcodec/qdm2: initialize sign_bits 
Fixes non deterministic output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 16:21:33 +02:00
Michael Niedermayer
fbe159e850 avcodec/qdm2: store bits in an integer instead of float variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 16:18:52 +02:00
Michael Niedermayer
2e6338b472 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  qdm2: Conceal broken samples

See: 5ee008e01d

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 16:00:57 +02:00
Luca Barbato
04e9853a21 wmavoice: return meaningful error codes 2013-07-10 15:49:51 +02:00
Luca Barbato
7d65e960c7 iff: Do not read over the source buffer 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-10 15:24:42 +02:00
Luca Barbato
3865ba7b21 iff: K&R formatting cosmetics 2013-07-10 15:23:51 +02:00
Michael Niedermayer
564909093a Merge commit 'adadc3f2443d25b375e21e801516ccfd78e0b080' 
* commit 'adadc3f2443d25b375e21e801516ccfd78e0b080':
  qdm2: refactor joined stereo support

Conflicts:
	libavcodec/qdm2.c

See: 2b12d1ffd8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 15:07:20 +02:00
Paul B Mahol
8491f40500 tak: use crc table from lavu 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 12:07:53 +00:00
Michael Niedermayer
a3d9a21683 Merge commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7' 
* commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7':
  imc: Catch a division by zero
  atrac3: Error on impossible encoding/channel combinations

See: 13451f5520

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 12:28:07 +02:00
Luca Barbato
5eaed6d336 atrac3: fix error handling 
decode_tonal_components returns a proper AVERROR.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 02:15:43 +02:00
Alexis Ballier
c3ca70204b codec_desc: fix typo in rv20 long_name. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 00:27:34 +02:00
Michael Niedermayer
233177a4ec jpegdec: clear EOBRUN on restarts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 23:49:06 +02:00
Michael Niedermayer
1c032e94d0 jpegdec: give handle_rstn() a return code that indicates if restart did happen 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 23:45:31 +02:00
Michael Niedermayer
776155ca29 mjpeg_decode_scan: reset restart state 
Fixes Ticket2082
Fixes progressive/refinement + restart jpegs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 23:43:36 +02:00
Michael Niedermayer
325411a687 snowenc: check minimum resolution 
Fixes Ticket1855

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 21:10:45 +02:00
Piotr Bandurski
aa74810fc6 bitstream: fix a crash in case of oom 
fixes ticket #2766

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 19:41:22 +02:00
Luca Barbato
87fb18c3e4 imc: Catch a division by zero 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Kostya Shishkov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 16:20:50 +02:00
Luca Barbato
4ecdb5ed44 qdm2: Conceal broken samples 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-09 15:57:46 +02:00
Luca Barbato
adadc3f244 qdm2: refactor joined stereo support 
qdm2 does support only two channels. Loop over the run once.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-09 15:57:32 +02:00
Michael Niedermayer
7d9cb12689 avcodec/wmaprodec: Check block_align 
Fixes undefined behavior
Its not known if this condition can be triggered through crafted input.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 15:32:21 +02:00
Michael Niedermayer
0dd99628ea ff_lpc_calc_coefs: assert that the type is levinson or cholesky 
Otherwise the code could misbehave (and there are no other types anyway)
Fixes CID700759

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 11:57:45 +02:00
Luca Barbato
bbf6a4aa20 imc: Catch a division by zero 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-09 10:49:29 +02:00
Luca Barbato
12576afe20 adpcm: Write the correct number of samples for ima-dk4 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-09 10:49:29 +02:00
Luca Barbato
50cf5a7fb7 atrac3: Error on impossible encoding/channel combinations 
Joint stereo encoded mono is impossible.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-09 10:49:29 +02:00
Luca Barbato
22e76ec635 atrac3: set the getbits context the right buffer_end 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-09 10:49:29 +02:00
Luca Barbato
874c8a17ac atrac3: fix error handling 
decode_tonal_components returns a proper AVERROR.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-09 10:49:29 +02:00
Michael Niedermayer
00b1401df6 avcodec/h264_ps: try to support Ambarella AVC 
Fixes Ticket2763

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 05:21:26 +02:00
Michael Niedermayer
a20f049c2a avcodec/libvpxenc: make class names unique 
This should fix an infinite loop with -h full

Found-by: <Foofie>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 03:04:31 +02:00
Michael Niedermayer
970c8df735 mpeg12dec: avoid reinitializtation on PS changes when possible. 
Fixes Ticket2574

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 21:55:04 +02:00
Carl Eugen Hoyos
b86651a208 Check the return value of ff_rv34_decode_init() in rv30.c and rv40.c 
Avoids possible null pointer dereferences on oom.

Fixes ticket #2727.
 2013-07-08 11:56:16 +02:00
Michael Niedermayer
44d0e520f8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  qdm2: check and reset dithering index per channel

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 05:26:17 +02:00
Michael Niedermayer
e1f98f2231 Merge commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad' 
* commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad':
  qdm2: formatting cosmetics

Conflicts:
	libavcodec/qdm2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 05:10:06 +02:00
Michael Niedermayer
d28a8ad8f3 Merge commit 'f054e309c58894450a5d18cce9799ef58aab9f14' 
* commit 'f054e309c58894450a5d18cce9799ef58aab9f14':
  qdm2: use init_static_data
  westwood_vqa: do not free extradata on error in read_header

Conflicts:
	libavformat/westwood_vqa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 05:02:52 +02:00
Michael Niedermayer
b5a87dc193 Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0' 
* commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0':
  vqavideo: check the version

Conflicts:
	libavcodec/vqavideo.c

See: b226af3910

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 04:53:52 +02:00
Paul B Mahol
099e57bc38 zmbvenc: remove unused AVFrame from encoder private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-07 23:50:54 +00:00
Paul B Mahol
3bec6a44ea zmbvenc: do not set avctx->coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-07 23:45:17 +00:00
Paul B Mahol
ec4e042f33 gif: remove unused AVFrame from encoder private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-07 23:06:06 +00:00
Paul B Mahol
bd03f99d05 gif: do not set avctx->coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-07 22:57:17 +00:00
Luca Barbato
744a11c996 qdm2: check and reset dithering index per channel 
Checking per subband would have the index exceed the
dithering noise table size.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-07 22:06:35 +02:00
Luca Barbato
76efedeadb qdm2: formatting cosmetics 
Apply the usual style plus drop few unnecessary return at the end
of void functions.
 2013-07-07 22:06:28 +02:00
Luca Barbato
f054e309c5 qdm2: use init_static_data 2013-07-07 22:06:20 +02:00
Luca Barbato
c4abc9098c vqavideo: check the version 
Prevent out of buffer write.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-07 22:04:05 +02:00
Ronald S. Bultje
46d208e1e0 vp8: Wait for prev_frame to parse segment_map before reading it 
This fixes occasional failures of vp8-test-vector-010 with frame-level
multithreading enabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-07 13:30:29 +03:00
Paul B Mahol
19436308b4 dxa: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-06 16:33:59 +00:00
Michael Niedermayer
2adf8a9c09 Merge commit '4e7f0b082d8c4b360312216b9241bec65ff63b35' 
* commit '4e7f0b082d8c4b360312216b9241bec65ff63b35':
  kmvc: Clip pixel position to valid range

The added clip should make no difference, there are already checks for
the index.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-07 11:17:53 +02:00