4014b401b0
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Allow decoding of slightly broken Nikon avi files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 04:24:02 +01:00
a493f8541d
avcodec/x86/dsp: add_int16_mmx / add_int16_sse2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 04:06:46 +01:00
da0684820a
avcodec/dsputil/huffyuv: move diff int16 and add int16 to dsputil
...
This also fixes masking the bits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 04:06:04 +01:00
f9c2d4d17e
Allow decoding of slightly broken Nikon avi files.
...
Fixes ticket #3330 .
2014-01-20 01:44:07 +01:00
f29cdbe1b5
vp8: remove redundant "equals 1" test
...
mb_layout is either zero or non-zero.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 22:26:43 +01:00
1a193c438c
lavf: add avformat_get_mov_video_tags() and avformat_get_mov_audio_tags()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 22:15:32 +01:00
fde2afd9fb
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
eac3: cosmetics, re-indent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 21:53:25 +01:00
10f1ee2f92
Merge commit 'ade75fb811500f3e3f284737f123938d83be728f'
...
* commit 'ade75fb811500f3e3f284737f123938d83be728f':
(e)ac3: clip surround mix level indexes.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 21:46:32 +01:00
3a5a039ade
Merge commit 'c229f571fd3c7d7b567c27c87b2bbcdaee1b0e9f'
...
* commit 'c229f571fd3c7d7b567c27c87b2bbcdaee1b0e9f':
(e)ac3: parse and store the Lt/Rt and LFE mix levels.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 21:37:06 +01:00
c3d1215683
Merge commit '1f604f96ea70503caa642f68a85be6074a5b3f46'
...
* commit '1f604f96ea70503caa642f68a85be6074a5b3f46':
ac3: set default matrix encoding modes in parse_frame_header.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 21:18:18 +01:00
9d13432a90
avformat/matroskadec: identify SMI as SVQ3
...
Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 20:13:38 +01:00
0d43b114cc
eac3: cosmetics, re-indent.
2014-01-19 19:12:58 +01:00
ade75fb811
(e)ac3: clip surround mix level indexes.
...
Values 0-2 are reserved, 3 (-1.5dB) should be used instead.
2014-01-19 19:12:52 +01:00
c229f571fd
(e)ac3: parse and store the Lt/Rt and LFE mix levels.
2014-01-19 19:12:42 +01:00
1f604f96ea
ac3: set default matrix encoding modes in parse_frame_header.
...
Deduplicates some code.
2014-01-19 19:12:33 +01:00
48218580e1
avformat/matroskadec: support QDM2 as generated by mkvtoolnix-6.7.0
...
Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 18:48:49 +01:00
5800b08572
avformat/matroskadec: support SVQ3 as generated by mkvtoolnix-6.6.0
...
Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 18:48:11 +01:00
0500623d58
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/dualinput: fix shortest option.
lavfi/vf_tile: use av_make_q.
lavfi/avf_concat: use av_make_q.
lavfi/af_amerge: use av_make_q.
lavu/rational: add syntactic sugar.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 17:48:07 +01:00
ad8d063f23
avcodec/mjpegdec: Dont skip picture allocation if theres no picture allocated
...
Fixes Ticket 3245
2014-01-19 17:30:22 +01:00
2dc5980d61
lavfi/dualinput: fix shortest option.
...
Fix trac ticket #3315 .
2014-01-19 17:13:36 +01:00
77b8d4e521
lavfi/vf_tile: use av_make_q.
2014-01-19 17:13:02 +01:00
c4b7ad324b
lavfi/avf_concat: use av_make_q.
2014-01-19 17:12:50 +01:00
bf9908c627
lavfi/af_amerge: use av_make_q.
2014-01-19 17:12:40 +01:00
3532dd52c5
lavu/rational: add syntactic sugar.
...
Add a function to create a rational
and macros for common values.
2014-01-19 17:12:22 +01:00
5607242155
doc/muxers: add "Options", "Examples", "Syntax", etc. subsections
...
More consistent with codec docs. Also some minor reorganization of sentences
to fit the new document hierarchy.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2014-01-19 13:40:37 +01:00
093439b481
doc/encoders: add libx264rgb doc and supported pixfmts for libx264(rgb)
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2014-01-19 13:40:32 +01:00
529573591a
doc/muxers/segment: fix formula for computing the segment_time_delta value
2014-01-19 12:20:10 +01:00
3dc494f8b9
lavfi/vidstabtransform: apply various documentation/option minor fixes
...
Improve consistency with the rest of the documentation.
2014-01-19 12:20:10 +01:00
676a395ab9
avcodec/aacdec: Dont fail if channels arent known yet
...
Fixes Ticket3312
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 06:20:46 +01:00
31e703e899
avcodec/mjpegdec: Dont treat the lack of a startcode differently from end of the bitstream
...
Fixes Ticket3303
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 05:03:16 +01:00
361e27a3d8
avcodec/mjpegdec: only run EOI emulation code when there was a scan
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 04:57:03 +01:00
8893f31e20
avcodec/mjpegdec: update cur_scan also for non-LS jpeg
...
This should make no difference but the variable will be used in a subsequent commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 04:57:03 +01:00
b9bedb0b28
avcodec/dnxhdenc: return meaningful return codes
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 00:09:36 +01:00
a52fbe5119
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
h264: check that an IDR NAL only contains I slices
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-18 23:13:33 +01:00
2510e820c4
Merge commit '9ecabd7892ff073ae60ded3fc0a1290f5914ed5c'
...
* commit '9ecabd7892ff073ae60ded3fc0a1290f5914ed5c':
h264: reset num_reorder_frames if it is invalid
Note, num_reorder_frames is not used in the failure case
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-18 22:59:46 +01:00
87e46dd5fb
Merge commit '0652e024c680420d298cdf3719d0a0c030173fe3'
...
* commit '0652e024c680420d298cdf3719d0a0c030173fe3':
h264: reset ref count if decoding the slice header fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-18 22:51:59 +01:00
59fb3c4be8
Merge commit '98cc9efc5f6b4dc847ed3b9b60b1c3bcd14e6791'
...
* commit '98cc9efc5f6b4dc847ed3b9b60b1c3bcd14e6791':
h264: prevent two matching fields from being both a short/long ref combination
See: 92002db3eb
2014-01-18 22:41:49 +01:00
329610303a
Merge commit '00dbff4c3e048b4abd01bf805725aabff0fa5ee1'
...
* commit '00dbff4c3e048b4abd01bf805725aabff0fa5ee1':
h264: do not call field_end if we do not have a current picture
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-18 21:51:40 +01:00
f2cb3b36ac
Merge commit '7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f'
...
* commit '7f0e81db3c4ee6f8ce15058bafa72ce928a89f3f':
h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3
Conflicts:
libavcodec/h264.c
See: d6a33f5d202005fddcbb
2014-01-18 21:44:18 +01:00
357a733f91
Merge commit 'd1b3fabe6945e511bb20fc9ca52b47eb952526ee'
...
* commit 'd1b3fabe6945e511bb20fc9ca52b47eb952526ee':
h264: reset first_field if frame_start() fails for missing refs
See: d7599bd8e2
2014-01-18 21:29:37 +01:00
06637c9295
Merge commit '210881110d3e22cca36edeaca118b5e22c998266'
...
* commit '210881110d3e22cca36edeaca118b5e22c998266':
Prepare for 10_alpha2 Release
Conflicts:
RELEASE
Not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-18 21:13:36 +01:00
8b2e5e42bb
h264: check that an IDR NAL only contains I slices
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
2014-01-18 20:53:31 +01:00
9ecabd7892
h264: reset num_reorder_frames if it is invalid
...
An invalid VUI is not considered a fatal error, so the SPS containing it
may still be used. Leaving an invalid value of num_reorder_frames there
can result in writing over the bounds of H264Context.delayed_pic.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
2014-01-18 20:53:06 +01:00
0652e024c6
h264: reset ref count if decoding the slice header fails
...
Otherwise the ER code might try to use some already freed references.
Fixes possible access to freed memory.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
2014-01-18 20:51:04 +01:00
98cc9efc5f
h264: prevent two matching fields from being both a short/long ref combination
...
Fixes possible access to freed memory.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
2014-01-18 20:42:39 +01:00
00dbff4c3e
h264: do not call field_end if we do not have a current picture
...
Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
2014-01-18 20:42:21 +01:00
7f0e81db3c
h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3
...
Higher modes are not allowed for 16x16/chroma, which is what this
function is used for. Otherwise this function would return 0 (vertical
prediction) for invalid higher modes, which could result in invalid
reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
2014-01-18 20:41:59 +01:00
d1b3fabe69
h264: reset first_field if frame_start() fails for missing refs
...
In this case we may not have a current frame, while first_field being
set implies we do.
Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
2014-01-18 20:41:24 +01:00
3dd04cbcf7
swresample: Add arm&x86 clobber tests
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-18 18:38:57 +01:00
26800e3864
vp9/x86: rename ff_avg[48]_sse to ff_avg[48]_mmxext
...
pavgb is an sse integer instruction, so the mmxext flag is enough
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-18 17:08:25 +01:00
Michael Niedermayer
Carl Eugen Hoyos
Peter Ross
wm4
Tim Walker
Nicolas George
Timothy Gu
Stefano Sabatini
Anton Khirnov
Martin Storsjö
James Almer