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
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
fa48be9b95
configure: Don't use symlinks for creating the out of tree makefile
...
On some platforms (such as msys), symlinks are (poorly) emulated
by simply creating a copy of the file.
This means that when building out of tree, the build tree gets
a copy of the original makefile, which can lead to unintuitive
build errors when the original makefile gets updated later.
Instead simply create a stub makefile which includes the real
one.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-11-19 10:12:58 +02:00
0dd8e96b32
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: Fix swapping of UV planes for VCR2
See: bae14f38d9
2013-11-19 04:15:57 +01:00
32ab5b82f4
Merge commit '69d4dbfd1faa99563065329656bbe597d612ca03'
...
* commit '69d4dbfd1faa99563065329656bbe597d612ca03':
aac_ac3_parser: simplify an expression
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 04:14:21 +01:00
8540368582
Merge commit '37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9'
...
* commit '37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9':
dcadec: simplify an expression
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 04:09:03 +01:00
56e122787e
Merge commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23'
...
* commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23':
lavc: use buf[0] instead of data[0] in checks whether a frame is allocated
Conflicts:
libavcodec/h264_refs.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 03:56:53 +01:00
16e7b189c5
mpegvideo: Fix swapping of UV planes for VCR2
2013-11-19 02:05:51 +01:00
69d4dbfd1f
aac_ac3_parser: simplify an expression
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-11-19 02:02:53 +01:00
37a3cac78c
dcadec: simplify an expression
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-11-19 02:02:49 +01:00
f0f04fd842
avcodec/asvenc: remove code allocating dummy coded_frame
...
Fixes memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-18 23:21:20 +01:00
918cab1a9f
avcodec/pcm-dvd: print actual block size values in block size changed warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-18 21:00:03 +01:00
4adf1fe34f
avcodec/pcm-dvd: fix incorrectly printed warning about changed block sizes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-18 21:00:03 +01:00
ab184b298d
avcodec/pcm-dvd: fix 20/24bit 1 channel
...
Fixes part of ticket3122
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-18 21:00:03 +01:00
Clément Bœsch
Michael Niedermayer
Stefano Sabatini
Derek Buitenhuis
Stephen Hutchinson
Compn
Tim Walker
Diego Biurrun
Vittorio Giovara
Martin Storsjö
Kostya Shishkov