Reimar Döffinger
d82729e5d9
Detect and skip mj2-style jp2c header.
...
This this fixes one of the issues with
http://blogs.bu.edu/mhirsch/files/2012/08/Rotate180CCW-checkerboard.mj2_.zip
and at least allows to demux the file properly instead
of failing during probing.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-05-05 10:01:22 +02:00
Claudio Freire
1ef82cc60d
AAC encoder: Fix rate control on twoloop.
...
Fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.
Now fixed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 04:19:34 +02:00
Claudio Freire
c545876d1b
AAC encoder: Fixed a rounding bug in psy's channel bitrate computation.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 01:24:57 +02:00
Michael Niedermayer
369a120826
xbmdec: fix off by one error in scanf()
...
Fixes out of array access
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 00:27:18 +02:00
Michael Niedermayer
c40f51e15b
h264: Always decode MMCOs into temprary array
...
When decoding succeeded the array is copied into the permanent one.
This prevents inconsistencies
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 20:23:05 +02:00
Michael Niedermayer
c7a7605656
wmaprodec: Fix null pointer dereference in decode_frame()
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 16:51:01 +02:00
Michael Niedermayer
e9e207ece7
dfa: Put our pointer check back.
...
The reimplementation by Libav does not prevent out of array
writes, even though it looks like it does at a quick glance.
No FFmpeg releases are affected by this
See: d1c95d2ce3
3623589edc
740ebe468c
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 14:42:19 +02:00
Hendrik Leppkes
d18341fb11
aacdec: free frame buffer if no audio was decoded
...
If no decoding error was detected, but still no audio was decoded, the
frame needs to be free'ed, or it will leak.
Fixes part of ticket #2095
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 13:20:19 +02:00
Michael Niedermayer
0104570fb6
Merge commit ' a5f8873620'
...
* commit 'a5f8873620 ':
silly typo fixes
Conflicts:
doc/protocols.texi
libavcodec/aacpsy.c
libavformat/utils.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 10:17:52 +02:00
Michael Niedermayer
711c8ee71d
Merge commit ' 4a7af92cc8'
...
* commit '4a7af92cc8 ':
sbrdsp: Unroll and use integer operations
sbrdsp: Unroll sbr_autocorrelate_c
x86: sbrdsp: Implement SSE2 qmf_deint_bfly
Conflicts:
libavcodec/sbrdsp.c
libavcodec/x86/sbrdsp.asm
libavcodec/x86/sbrdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 10:07:43 +02:00
Michael Niedermayer
f18d2dff11
evrcdec: fix sign error
...
The specification wants round(abs(x))) * sign(x) which is
equivakent to round(x)
Fixes out of array access
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 02:50:30 +02:00
Michael Niedermayer
64819bfc7a
snow: Fix off by 1 error in reference picture management
...
Fixes out of array accesses
No release is affected by this bug
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 01:19:48 +02:00
Michael Niedermayer
e756635964
eamad: Check against minimum supported dimensions
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 23:17:37 +02:00
Diego Biurrun
a5f8873620
silly typo fixes
2013-05-03 18:26:12 +02:00
Christophe Gisquet
4a7af92cc8
sbrdsp: Unroll and use integer operations
...
This patch can be controversial, by assuming floats are IEEE-754 and
particular behaviour of the FPU will get in the way.
Timing on Arrandale and Win32 (thus, x87 FPU is used in the reference).
sbr_qmf_pre_shuffle_c: 115 to 76
sbr_neg_odd_64_c: 84 to 55
sbr_qmf_post_shuffle_c: 112 to 83
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-03 18:23:30 +02:00
Christophe Gisquet
8394d9a676
sbrdsp: Unroll sbr_autocorrelate_c
...
1410 cycles to 1148 on Arrandale/Win64
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-03 18:23:30 +02:00
Christophe Gisquet
5a97469a4f
x86: sbrdsp: Implement SSE2 qmf_deint_bfly
...
Sandybridge: 47 cycles
Having a loop counter is a 7 cycle gain.
Unrolling is another 7 cycle gain.
Working in reverse scan is another 6 cycles.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-03 18:23:14 +02:00
Michael Niedermayer
d29f9f4a0e
vc1dec: fix lutuv use in vc1_mc_4mv_chroma4()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 18:09:15 +02:00
Michael Niedermayer
7e30bfcb91
vc1dec: Fix mixed field/frame intensity compensation
...
Fixes Ticket2523
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 18:04:48 +02:00
Michael Niedermayer
90c2e40ebb
vc1dec: vc1_mc_4mv_chroma4: match addressing between compensation and MC
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 18:04:48 +02:00
Michael Niedermayer
9fd5e75bdf
Merge commit ' accde1bd87'
...
* commit 'accde1bd87 ':
vc1_parser: Set field_order.
mpegvideo_parser: Set field_order.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 13:03:00 +02:00
Michael Niedermayer
6fc58a8cb6
Merge commit ' 507b1e454c'
...
* commit '507b1e454c ':
avcodec: Add field order information to AVCodecParserContext.
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 12:15:01 +02:00
Michael Niedermayer
2ee29b5fb9
avcodec: move lowres down with the next ABI bump and add accessors
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 11:32:04 +02:00
Michael Niedermayer
88ef7f6d2b
Merge commit ' 803d21f38b'
...
* commit '803d21f38b ':
lavc: schedule AVCodecContext.lowres for removal on next bump.
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 11:30:00 +02:00
Michael Niedermayer
1ba4cbf734
Merge commit ' 6b753015ca'
...
* commit '6b753015ca ':
aac: Remove aacpsy.h header, unused since 78e65cd772
cavs: Remove cavsdata.h header, unused since 88386feefd
Conflicts:
libavcodec/aacpsy.h
libavcodec/cavsdata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 10:55:43 +02:00
Michael Niedermayer
05599308e9
Merge commit ' bf7c3c6b15'
...
* commit 'bf7c3c6b15 ':
x86: dsputil: Move cavs and vc1-specific functions where they belong
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 10:50:27 +02:00
Michael Niedermayer
35ef98013d
Merge commit ' 9328062321'
...
* commit '9328062321 ':
x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c
x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 10:44:09 +02:00
Michael Niedermayer
ed1697ffcb
Merge commit ' 9b3a04d306'
...
* commit '9b3a04d306 ':
x86: Move duplicated put_pixels{8|16}_mmx functions into their own file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 10:36:52 +02:00
Masaki Tanaka
accde1bd87
vc1_parser: Set field_order.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-03 08:20:19 +02:00
Masaki Tanaka
f43c14d046
mpegvideo_parser: Set field_order.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-03 08:20:11 +02:00
Masaki Tanaka
507b1e454c
avcodec: Add field order information to AVCodecParserContext.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-03 08:16:10 +02:00
Anton Khirnov
803d21f38b
lavc: schedule AVCodecContext.lowres for removal on next bump.
...
It has been deprecated some time ago, but was forgotten during the last
bump.
2013-05-03 08:07:35 +02:00
Michael Niedermayer
ae2132ac90
mmvideo/mm_decode_intra: check horizontal coordinate too
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 22:12:19 +02:00
Michael Niedermayer
8d3c99e825
mmvideo/mm_decode_inter: check horizontal coordinate too
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 22:05:19 +02:00
Diego Biurrun
6b753015ca
aac: Remove aacpsy.h header, unused since 78e65cd772
2013-05-02 18:16:06 +02:00
Diego Biurrun
153f31b1af
cavs: Remove cavsdata.h header, unused since 88386feefd
2013-05-02 18:15:37 +02:00
Michael Niedermayer
60ab448042
ape_decode_value_3860: check k before using it in get_bits()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 17:24:02 +02:00
Michael Niedermayer
8937230719
ape_decode_value_3900: check tmpk
...
Fixes division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 16:45:32 +02:00
Paul B Mahol
663794f63d
vmdav: unbreak decoding of samples from game The Last Dynasty
...
This fixes video output with samples HG060808.VMD and
HG060810.VMD. Regression since c0cbe36b18 .
While here show warning if decoding is aborted for some reason.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-02 11:37:59 +00:00
Paul B Mahol
cdada4f639
vmdav: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-02 11:34:14 +00:00
Michael Niedermayer
4d4ec18b21
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Add wmv2 dependency to vc1 compilation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 13:02:09 +02:00
Michael Niedermayer
0beff42823
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
id3v2: K&R formatting cosmetics
ppc: Only compile AltiVec FFT assembly when AltiVec is enabled
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 12:49:23 +02:00
Diego Biurrun
bf7c3c6b15
x86: dsputil: Move cavs and vc1-specific functions where they belong
2013-05-02 11:45:37 +02:00
Diego Biurrun
9328062321
x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c
...
The function does not do any rounding, so there is no point in
keeping it in a round template file.
2013-05-02 11:45:37 +02:00
Diego Biurrun
9c112a6158
x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c
...
The function is only instantiated once, so there is no point
in keeping it in a template file.
2013-05-02 11:45:37 +02:00
Diego Biurrun
9b3a04d306
x86: Move duplicated put_pixels{8|16}_mmx functions into their own file
2013-05-02 11:16:45 +02:00
Carl Eugen Hoyos
d0a661d48a
Add wmv2 dependency to vc1 compilation.
...
Fixes compilation with --disable-everything --enable-decoder=vc1.
2013-05-02 11:04:57 +02:00
Diego Biurrun
a650c906cb
ppc: Only compile AltiVec FFT assembly when AltiVec is enabled
2013-05-02 10:25:30 +02:00
Michael Niedermayer
6021615bbe
avcodec/ansi: Fix right/bottom end checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 02:16:41 +02:00
Michael Niedermayer
e91fd754c6
avcodec/ansi: Check x/y
...
This prevents out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 02:15:40 +02:00