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

24475 Commits

Author SHA1 Message Date
Michael Niedermayer
9328ae4843 Merge commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22' 
* commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22':
  cllc: Use outbuf in RGB and ARGB functions
  cllc: Implement YUV support

Conflicts:
	libavcodec/cllc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-25 10:51:19 +02:00
Derek Buitenhuis
61c82214af cllc: Use outbuf in RGB and ARGB functions 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-24 17:59:58 -04:00
Derek Buitenhuis
d48f221952 cllc: Implement YUV support 
Fixes ticket #1910.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-24 17:59:58 -04:00
Derek Buitenhuis
d9c89ef86b cllc: Use outbuf in RGB and ARGB functions 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-24 14:55:01 -04:00
Derek Buitenhuis
1ef6ac1071 cllc: Implement YUV support 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-24 14:54:46 -04:00
Michael Niedermayer
bbe26eff22 h264: Fix null pointer dereference with disabled error concealment 
Fixes Ticket2551

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 16:05:19 +02:00
Michael Niedermayer
af5f9c0876 Merge commit '95d52464542f532061290192518d5fe1c1930e8d' 
* commit '95d52464542f532061290192518d5fe1c1930e8d':
  lavc: Add option to encode MPEG-2 AAC with libfdk-aac

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 10:57:04 +02:00
Kieran Kunhya
95d5246454 lavc: Add option to encode MPEG-2 AAC with libfdk-aac 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-06-24 08:03:26 +02:00
Michael Niedermayer
5dba888dd5 msmpeg4: Fix ff_msmpeg4_pred_dc() so it works with lowres>0 
Fixes Ticket2532

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-24 03:44:30 +02:00
Michael Niedermayer
9375f5003d sonic: use av_freep() as its safer than av_free() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 19:45:39 +02:00
Michael Niedermayer
69d0a2922f sonic: cleanup/simplify num_taps check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 19:44:24 +02:00
Michael Niedermayer
db27dadcb0 sonic: replace divide() by ROUNDED_DIV() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 19:42:24 +02:00
Ronald S. Bultje
c329713de7 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: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 17:13:58 +02:00
Michael Niedermayer
730e07f10b sonic: avoid float sqrt() for integer input & output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 01:35:34 +02:00
Michael Niedermayer
4ec7ef56bd sonic: simplify quant cliping 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 01:35:34 +02:00
Michael Niedermayer
bcb42fb6db sonic: use av_calloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 01:26:18 +02:00
Michael Niedermayer
37c7a8be19 sonic: replace literal numbers by sizeof() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-22 22:25:18 +02:00
Michael Niedermayer
081a7f3ed0 sonic: replace some float by integers to improve platform independance 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-22 21:58:13 +02:00
Michael Niedermayer
12de2933da sonic: Improve error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-22 21:42:04 +02:00
Michael Niedermayer
8689ee0eef sonic: simplify shift_down() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-22 21:34:11 +02:00
Hendrik Leppkes
d76fff7df7 smvjpeg: use refcounted frames to avoid mem leaks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-22 11:58:46 +02:00
Hendrik Leppkes
1a405c683e smvjpeg: remove redundant frame init code 
avctx->coded_frame is not used for decoders anymore,
and av_frame_alloc does all the frame initialization required.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-21 21:53:34 +02:00
Michael Niedermayer
d6a33f5d20 h264: fix size of arrays in ff_h264_check_intra_pred_mode() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-21 20:48:07 +02:00
Michael Niedermayer
2005fddcbb h264/ff_h264_check_intra_pred_mode: fix input value check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-21 20:48:07 +02:00
Hendrik Leppkes
659df32a9d mathops/x86: work around inline asm miscompilation with GCC 4.8.1 
The volatile is not required here, and prevents a miscompilation with GCC
4.8.1 when building on x86 with --cpu=i686

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-21 12:47:03 +02:00
Michael Niedermayer
79cd5d39ba avcodec/utvideodec: Fix vlc len 
Fixes regression / Ticket2661

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-21 03:22:02 +02:00
Michael Niedermayer
c17dd513e7 bytestream2_init: assert that buf_size is valid 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-21 00:58:41 +02:00
Michael Niedermayer
32fc8d6db6 avcodec/jpeg2000dec: check that tp_end is after the start 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-21 00:58:41 +02:00
Anton Khirnov
720a1de52f lavc: free the padded last frame during audio encoding properly 2013-06-20 16:49:11 +02:00
Michael Niedermayer
ddefb80c95 sonicenc: fix off by 1 error 
Fixes out of array accesses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-19 10:06:38 +02:00
Michael Niedermayer
694c2d1ab3 sonicenc: dont put multiple assignments per line 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-19 10:06:10 +02:00
Michael Niedermayer
6df61c3ae0 sonicenc: set supported samples formats array 
This ensures that only supported formats are input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-19 09:50:01 +02:00
Janne Grunau
2ee380aefb vaapi: return early from ff_vaapi_render_picture() without picture 
Fixes an assertion when called on uninitialized frame. Spotted after
seeking in vlc.
Fixes ticket #2461.

Tested-by: Timo
Reviewed-by: Joakim Plate
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-06-18 01:56:06 +02:00
Carl Eugen Hoyos
28bf0d94aa Revert "vaapi: return early from ff_vaapi_render_picture() without picture" 
This reverts commit 4cbf245f2a2cd2170ca30b0788c2af5b506fe6d6.

I messed up the author information.
 2013-06-18 01:54:30 +02:00
Carl Eugen Hoyos
3cbf245f2a vaapi: return early from ff_vaapi_render_picture() without picture 
Fixes an assertion when called on uninitialized frame. Spotted after
seeking in vlc.
Fixes ticket #2461.

Tested-by: Timo
Reviewed-by: Joakim Plate
 2013-06-18 00:21:09 +02:00
Michael Niedermayer
582f53349e jpeg2000dec: make cblk->length(inc)/data use consistent 
Fixes Ticket2612

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 20:08:51 +02:00
Michael Niedermayer
6c655b40ea Merge commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c' 
* commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c':
  smacker: check the return value of smacker_decode_tree

Conflicts:
	libavcodec/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 00:36:25 +02:00
Michael Niedermayer
85a3d20da5 Merge commit 'f52edef30197735bfb937e9e723ab1e7b31165c6' 
* commit 'f52edef30197735bfb937e9e723ab1e7b31165c6':
  smacker: fix an off by one in huff.length computation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 00:34:07 +02:00
Michael Niedermayer
a4a2e894fc Merge commit '985f34b75653d02eda8eb8def3412f8577f19b01' 
* commit '985f34b75653d02eda8eb8def3412f8577f19b01':
  utils: fix avcodec_flush_buffers pre-reference counting compatibility

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-17 00:21:22 +02:00
Michael Niedermayer
301522f521 Merge commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3' 
* commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3':
  bitstream: forward error values and drop few abort()

Conflicts:
	libavcodec/bitstream.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 23:29:37 +02:00
Michael Niedermayer
9265bae356 Merge commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f' 
* commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f':
  bitstream: K&R formatting cosmetics

Conflicts:
	libavcodec/bitstream.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 23:18:57 +02:00
Michael Niedermayer
9f91e7deec Merge commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7' 
* commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7':
  h264_mp4toannexb_bsf: return a padded buffer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 23:01:41 +02:00
Michael Niedermayer
0a5d22a195 Merge commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e' 
* commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e':
  h264_mp4toannexb_bsf: factor out extradata parsing

Conflicts:
	libavcodec/h264_mp4toannexb_bsf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 22:51:56 +02:00
Michael Niedermayer
46a5003a4a Merge commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e' 
* commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e':
  h264_mp4toannexb_bsf: K&R formatting cosmetics

Conflicts:
	libavcodec/h264_mp4toannexb_bsf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 22:40:43 +02:00
Kostya Shishkov
bbb2945f2d smacker: check the return value of smacker_decode_tree 
Also prevent a memory leak.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-06-16 15:56:50 +02:00
Kostya Shishkov
f52edef301 smacker: fix an off by one in huff.length computation 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-06-16 15:55:53 +02:00
Michael Niedermayer
3b86174290 avcodec/jpeg2000dec: move bpno check to a earlier place 
This prevents additional integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 15:27:39 +02:00
Janne Grunau
985f34b756 utils: fix avcodec_flush_buffers pre-reference counting compatibility 
The to_free AVframe must be freed just like the other ones.
Indeed, the calling application may expect all frames to be
released.

(This regression caused use-after-free in VLC with hwaccel.)

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-06-16 15:10:58 +02:00
Hendrik Leppkes
8962da9ec3 rawdec: allocate a buffer in the appropriate size in the copy case. 
Otherwise the created buffer can be smaller than buf_size, which results
in buffer overreads if the original image has extra padding on every line.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 09:50:16 +02:00
Luca Barbato
f80b60ad59 bitstream: forward error values and drop few abort() 2013-06-16 09:30:26 +02:00