f0f75dfa34
avformat/utils: inject audio skip side data before the side data merge code
...
This ensures that its handled the same way as other side data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-21 03:21:23 +01:00
01923bab98
avcodec: move end zeroing code from av_packet_split_side_data() to avcodec_decode_subtitle2()
...
This code changes the input packet, which is read only and can in
rare circumstances lead to decoder errors. (i run into one of these in
the audio decoder, which corrupted the packet during av_find_stream_info()
so that actual decoding that single packet failed later)
Until a better fix is implemented, this commit limits the problem.
A better fix might be to make the subtitle decoders not depend on
data[size] = 0 or to copy their input when this is not the case.
2013-11-21 03:13:26 +01:00
98fc81b20d
avformat/utils: move side data merge after parser
...
merging before the parser can conflict with the parser, also
future changes depend on it being done later
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-21 01:02:11 +01:00
a7b87ca911
libxavs: rename and fix a variable name
...
It was mis-spelled in b18c7c8d3d
2013-11-20 21:06:31 +01:00
e50278348a
avcodec/avpacket: fix order of operations in case of too large allocation
...
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 19:44:21 +01:00
34b7c82dd3
avcodec/utils: use the unpack_dictionary function
...
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 18:23:24 +01:00
fcb1b0078d
avcodec/avpacket: use size_t, fix potential integer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 17:35:48 +01:00
c28b61caf0
Document new APIs for av_packet_{un, }pack_dictionary()
...
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reveiwed-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 17:03:19 +01:00
51a84a6bca
avpacket: add pack/unpack functions for AVDictionary
...
These functions are intended for use with side_data which comes in an
AVPacket.
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reviewed-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 16:48:51 +01:00
1e506a2cc5
avcodec: add side_data type for updated metadata
...
This type is intended to be used to allow codecs to pass updated
metadata to applications.
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reviewed-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 16:48:51 +01:00
ddaf543aa6
avfilter/showspectrum: use 0 dummies for range in const.
...
This is consistent with other options.
2013-11-20 16:38:09 +01:00
9343fc30e2
avfilter/showspectrum: reindent const options.
2013-11-20 16:37:34 +01:00
9c8b240806
avfilter/showspectrum: add blackman window.
2013-11-20 16:35:48 +01:00
3e69f7c221
avfilter/showspectrum: add win_func option.
2013-11-20 16:22:05 +01:00
973b1a6b90
vda_h264_dec: backup context before overriding
...
Some of context fields which must be overrided by this wrapper decoder
may be set and used by user, so we have to save and restore them before
and after invoking the inner decoder to secure user.
2013-11-20 22:40:54 +08:00
ec312c1fd0
fate: test -mbd rd for h261
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 15:38:56 +01:00
6c04c5f733
avcodec/h261enc: dont use current_mv_x/y
...
Fixes -mbd rd
Fixes Ticket3151
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 15:28:46 +01:00
cccdaa406a
avcodec/h261enc: avoid use of current/previous_mba
...
Fixes part of Ticket3151
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 15:14:01 +01:00
bb7f3ddd42
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
win{32,64}: Hard disable symbol versioning
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 04:21:36 +01:00
61f40fbb52
Merge commit 'ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79'
...
* commit 'ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79':
ac3dec: simplify an expression
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 04:20:36 +01:00
df87cfd798
ffmpeg: fix do_streamcopy() so it copies side data too
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 00:23:23 +01:00
05493c6e72
avcodec/avpacket: correctly set the number of side data elements in av_copy_packet_side_data()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 00:23:23 +01:00
f95b5d2a11
cmdutils: cosmetics
...
requested by multiple people
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 00:23:23 +01:00
80e5859d7a
doc/muxers/segment: remove wrong default indication for segment_list_flags option
2013-11-19 23:24:54 +01:00
f836b0c581
swscale/x86: SIMD deinterleaveBytes() depends on YASM
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 22:36:27 +01:00
03f6d4e0f1
win{32,64}: Hard disable symbol versioning
...
ICL doesn't return an error on unknown parameters, and will
always pass the symver_gnu_asm test, and since Windows
never has symbol versioning, just always disable it.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-11-19 21:30:13 +00:00
69cf626f9c
cmdutils: Add -buildconf option.
...
The output is formatted to display one option per line.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 22:09:48 +01:00
d5d29ae3b0
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
dv_tablegen: Remove CONFIG_SMALL preprocessor check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 22:03:27 +01:00
ef7f751642
riff: add DYM4 mpeg4 fourcc
2013-11-19 14:24:25 -05:00
ffb0af7f17
ac3dec: simplify an expression
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-11-19 18:52:17 +01:00
066dbfe165
Merge commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da'
...
* commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da':
avcodec.h: include version.h before using version macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 18:19:06 +01:00
6a71efff33
avfilter/vf_tinterlace: check clone return value
...
Inspired by: 3a16ec19d2
2013-11-19 18:08:58 +01:00
0a382aa99b
Merge commit '3a16ec19d2426457419cb8a7304f97982699efda'
...
* commit '3a16ec19d2426457419cb8a7304f97982699efda':
vf_interlace: check one av_frame_clone allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 18:06:40 +01:00
8983dea426
Merge commit 'c673fc919c374c60b1e6d80d8822712eadf67f16'
...
* commit 'c673fc919c374c60b1e6d80d8822712eadf67f16':
hevc_sei: drop unused parameter
Conflicts:
libavcodec/hevc_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 17:59:47 +01:00
2c6e693c97
Merge commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e'
...
* commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e':
mpeg4videodec: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 17:53:14 +01:00
18df75fa2f
Merge commit '8769113accf1f3b78634dec60b37f7354ed6d88d'
...
* commit '8769113accf1f3b78634dec60b37f7354ed6d88d':
mpeg4videoenc: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg4videoenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 16:19:42 +01:00
57f13fd7e9
dv_tablegen: Remove CONFIG_SMALL preprocessor check
...
The code does in no way depend on CONFIG_SMALL.
2013-11-19 16:04:27 +01:00
3033cd7555
swscale/x86/rgb2rgb_template: add mmx/sse2/avx optimized deinterleaveBytes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 15:13:48 +01:00
1de064e21e
swscale/x86/rgb2rgb: change cpu optim identifiers to lower case
...
This makes the code more similar to the other optims and allows us
to use the same macros to build function names
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 15:13:48 +01:00
4729b529e6
swscale/x86/rgb2rgb: extend framework to also include AVX
...
This does not yet include any actual AVX code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 15:13:48 +01:00
94d7ca2b58
swscale: fix used stride in planarToNv12Wrapper()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 15:13:48 +01:00
ef627bf9ec
swscale: add nv12/nv21->yuv420 converter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 15:13:48 +01:00
6f1ec8edf2
avcodec.h: include version.h before using version macro
2013-11-19 14:48:36 +01:00
3a16ec19d2
vf_interlace: check one av_frame_clone allocation
2013-11-19 14:48:36 +01:00
c673fc919c
hevc_sei: drop unused parameter
2013-11-19 14:48:36 +01:00
d234c7a07c
mpeg4videodec: K&R formatting cosmetics
2013-11-19 14:48:36 +01:00
8769113acc
mpeg4videoenc: K&R formatting cosmetics
2013-11-19 14:48:36 +01:00
722fb81dc5
avformat/jacosubdec: make probing less tolerant.
...
Fixes a failure with probetest:
./tools/probetest 8192 500000
[...]
Failure of jacosub probing code with score=51 type=1 p=CAB size=16
Random data was:
00000000 40 37 40 30 93 01 48 e0 09 96 10 90 78 0f 0c 10 @7@0..H.....x...
2013-11-19 12:53:20 +01:00
b31587af4b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: Don't use symlinks for creating the out of tree makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 11:34:50 +01:00
1f7b7d5447
doc/examples: fix mem issues in filtering_video.
2013-11-19 10:31:39 +01:00
Michael Niedermayer
Sean McGovern
Ben Boeckel
Clément Bœsch
Xidorn Quan
Stefano Sabatini
Derek Buitenhuis
Stephen Hutchinson
Compn
Tim Walker
Diego Biurrun
Vittorio Giovara