Michael Niedermayer
2773ab36cc
avcodec/jpeglsdec/ff_jpegls_decode_lse: check len field validity
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 23:12:44 +02:00
Michael Niedermayer
020600eed1
avcodec/jpeglsdec: ask for sample for "oversized image"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 23:12:44 +02:00
Michael Niedermayer
375013e3d6
avcodec/mpeg12dec: drop confusing av_dlog()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 23:12:44 +02:00
Anthoine Bourgeois
d8ab7f31dd
avcodec/dirac_arith: Fix build with PIC and stack-check options
...
Fixes Ticket3540
The function dirac_get_arith_bit in libavcodec/dirac_arith.h can't be
built with PIC and check-stack because the asm code needs 6 registers
and PIC and check-stack options take 1 each and x86 is quite limited
in this area.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 19:41:48 +02:00
Michael Niedermayer
dddacf780f
avcodec/sanm: use named consant instead of literal number
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 16:23:57 +02:00
Michael Niedermayer
acf112ba6e
avcodec/mpegvideo: remove AVFrame padding, as the hack isnt needed anymore
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 16:17:22 +02:00
Michael Niedermayer
2ca553ed9c
avcodec/snowenc: remove operations that have become redundant with AVFrame pointers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 16:17:22 +02:00
Michael Niedermayer
59a53842d3
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: operate with pointers to AVFrames instead of whole structs
Conflicts:
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/intrax8.c
libavcodec/mpeg12enc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/mpegvideo_xvmc.c
libavcodec/msmpeg4.c
libavcodec/ratecontrol.c
libavcodec/vaapi.c
libavcodec/vc1dec.c
libavcodec/vdpau_vc1.c
See: fc567ac49e17151f00f31b59030cd10f952612ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 15:18:46 +02:00
Michael Niedermayer
44841528c1
avcodec/mpegaudioenc_template: reorder operations to prevent integer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 07:04:12 +02:00
Michael Niedermayer
9d66aa2c8f
avcodec/mpegaudioenc_template: dont crash on bitrate=0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 05:16:52 +02:00
Michael Niedermayer
233dbee3bc
Merge commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a'
...
* commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a':
rawvideo: Support decoding YVYU422 FourCC
See: ab7d6cb8f770c3b88a8139d1182fcc934062f891
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 04:06:35 +02:00
Michael Niedermayer
352e13e2a9
Merge commit '46439e156219d27f059cf687743ba5aacf238b87'
...
* commit '46439e156219d27f059cf687743ba5aacf238b87':
mp2: match twolame default options
Not merged as the change breaks fate, also forcing resampling to specific sample rate
reduces quality, and would be like rescaling every movie to 1080.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 02:59:43 +02:00
Michael Niedermayer
6c019f05ed
Merge commit '718907cd881a0b593264aed059c0e00da13f9e15'
...
* commit '718907cd881a0b593264aed059c0e00da13f9e15':
libtwolame MP2 encoding support
Conflicts:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/libtwolame.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 02:17:56 +02:00
wm4
f6774f905f
mpegvideo: operate with pointers to AVFrames instead of whole structs
...
The most interesting parts are initialization in ff_MPV_common_init() and
uninitialization in ff_MPV_common_end().
ff_mpeg_unref_picture and ff_thread_release_buffer have additional NULL
checks for Picture.f, because these functions can be called on
uninitialized or partially initialized Pictures.
NULL pointer checks are added to ff_thread_release_buffer() stub function.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-09 02:12:19 +02:00
Vittorio Giovara
b6a09ef700
rawvideo: Support decoding YVYU422 FourCC
2014-04-08 23:24:36 +02:00
Michael Niedermayer
2daf580284
avcodec/j2kenc: use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-08 23:12:26 +02:00
Michael Niedermayer
8ff061095f
avcodec/libzvbi-teletextdec: remove * 1
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-08 23:12:26 +02:00
Michael Niedermayer
818aaa7636
avcodec/libopencore-amr: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-08 23:12:26 +02:00
Michael Niedermayer
e20e854ca0
vcodec/bitstream: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-08 16:18:29 +02:00
Michael Niedermayer
33c9bb943b
avcodec/avpacket: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-08 16:17:40 +02:00
Michael Niedermayer
e4c180c05a
avcodec/a64multienc: use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-08 16:15:32 +02:00
Michael Niedermayer
c8a1f10cf4
avcodec/ac3enc_float: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-08 15:35:47 +02:00
Vittorio Giovara
46439e1562
mp2: match twolame default options
2014-04-07 23:50:33 +02:00
Paul B Mahol
718907cd88
libtwolame MP2 encoding support
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-07 23:50:33 +02:00
Carl Eugen Hoyos
836b60ce2b
Fix standalone compilation of vp7 and vp8 decoder.
...
Fixes ticket #3536 .
2014-04-07 15:30:48 +02:00
Carl Eugen Hoyos
993a5afaad
Read aspect ratio from tiff image files.
2014-04-07 15:30:48 +02:00
Vittorio Giovara
17a75a8c09
libxvid: fix missing end of line character
...
Error introduced in 5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1.
2014-04-07 14:56:25 +02:00
Matt Oliver
158a80cc0b
Remove leal op to fix icl inline asm.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07 13:02:54 +02:00
Michael Niedermayer
a75ba1e116
avcodec/h264/find_start_code: factorize addition out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07 04:18:21 +02:00
Michael Niedermayer
0ecb3075c1
Merge commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a'
...
* commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a':
h264: Refactor decode_nal_units
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07 03:59:22 +02:00
Michael Niedermayer
a7a82f2f22
Merge commit 'c389a804943095ebf078daec6b64690d2c97069c'
...
* commit 'c389a804943095ebf078daec6b64690d2c97069c':
libxvid: Add SSIM displaying through a libxvidcore plugin
Conflicts:
libavcodec/libxvid.c
libavcodec/version.h
See: 3b3c1ed0768af874c624cc555fbbd1fcea370200
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07 03:20:23 +02:00
Michael Niedermayer
072278c777
Merge commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1'
...
* commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1':
libxvid: add working lumimasking and variance AQ
Conflicts:
libavcodec/libxvid.c
libavcodec/version.h
See: ccb212b6c3ed18c9ff4e0c982574c43f92657f9f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07 03:08:25 +02:00
Michael Niedermayer
190106e884
Merge commit 'd3789eeeed3423bd1ca9dc40030a2f7a21ea5332'
...
* commit 'd3789eeeed3423bd1ca9dc40030a2f7a21ea5332':
aarch64: implement videodsp.prefetch
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07 02:51:05 +02:00
Stephan Hilb
541bebd414
lavc/cpia: use avpriv_report_missing_feature()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07 01:33:53 +02:00
Stephan Hilb
5dae3cf357
lavc/cpia: fix typo in log message
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07 01:33:10 +02:00
Luca Barbato
e10fd08aa7
h264: Refactor decode_nal_units
2014-04-06 23:33:17 +02:00
Timothy Gu
c389a80494
libxvid: Add SSIM displaying through a libxvidcore plugin
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-06 23:23:13 +02:00
Timothy Gu
5ce7ca68b8
libxvid: add working lumimasking and variance AQ
...
The old implementation is unusable due to changes in the Xvid API.
Further fixes by Michael Niedermayer <michaelni@gmx.at>.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-06 23:23:13 +02:00
Michael Niedermayer
787be6d074
Merge commit '6f273093e54cba130f3ffde3d6433e74baa4ad89'
...
* commit '6f273093e54cba130f3ffde3d6433e74baa4ad89':
LucasArts SMUSH VIMA audio decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavcodec/vima.c
This commit adds a AV_CODEC_ID_ADPCM_VIMA alias in addition to the previously
used AV_CODEC_ID_VIMA, as well as a AVCodec with name "adpcm_vima" in addition
to the previously used name "vima"
These changes are needed for compatibility with the renamed codec in libav
See: b18357326ca1522d7fb7f4276ddebfccc29ce72c and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06 23:14:23 +02:00
Michael Niedermayer
881f4e8d34
Merge commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2'
...
* commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2':
LucasArts SMUSH SANM video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/sanm.c
libavcodec/version.h
See: 69254f46286099588514454f60fad12f6e51b2cd and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06 22:19:16 +02:00
Janne Grunau
d3789eeeed
aarch64: implement videodsp.prefetch
...
8% faster h264 decoding on Apple A7.
2014-04-06 21:18:49 +02:00
Hendrik Leppkes
fc7e02f0ff
dcadsp: fix SSE code to not use SSE2 instructions.
...
movq from SSE register to memory is an SSE2 instruction.
Instead, use SSE movlps, which does the same thing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06 18:31:22 +02:00
Michael Niedermayer
28f8114bd2
avcodec/vp8: fix checking vp7_feature_value_size
...
Fixes CID1197061
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06 18:10:47 +02:00
Paul B Mahol
6f273093e5
LucasArts SMUSH VIMA audio decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-06 16:41:39 +02:00
Paul B Mahol
a420ccd4f2
LucasArts SMUSH SANM video decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-06 16:40:27 +02:00
Michael Niedermayer
754f84663e
avcodec/msrle: check return code for success before use
...
The check is possibly redundant, but better to check for errors
that dont occur than to skip the check and crash
Fixes CID1197060
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06 04:01:24 +02:00
Michael Niedermayer
f87b3d5523
avcodec/pthread_frame: fix missing unlock on error
...
Fixes CID1197057
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06 03:51:46 +02:00
Carl Eugen Hoyos
59c1023ef5
Consider aspect ratio when writing tiff dpi.
...
TIFFTAG_YRESOLUTION gets now adjusted to sample_aspect_ratio.
2014-04-06 02:42:31 +02:00
Michael Niedermayer
d167faafe9
avcodec/wma: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05 21:34:03 +02:00
Michael Niedermayer
26e70fd5ba
avcodec/vp8: fix name of copy_luma()
...
This function was introduced by ac4b32df71bd932838043a4838b86d11e169707f
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05 21:33:53 +02:00