Diego Biurrun
b76871d870
parser: Remove commented-out cruft
...
(cherry picked from commit ed61f3ca8a
)
2014-03-02 11:42:38 -05:00
Anton Khirnov
15ae305007
af_compand: add a dependency on strtok_r
...
(cherry picked from commit 291e49d4e7
)
2014-03-02 11:42:38 -05:00
Vittorio Giovara
3c72204ae0
doc: name correct header
...
(cherry picked from commit 48d1ed9c83
)
2014-03-02 11:42:38 -05:00
Andrew Kelley
ba21499648
lavfi: add compand audio filter
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
(cherry picked from commit 738f83582a
)
Conflicts:
libavfilter/version.h
2014-03-02 11:42:38 -05:00
Anton Khirnov
7933039ade
af_resample: preserve frame properties
...
(cherry picked from commit dcc7e4bf1d
)
2014-03-02 11:42:37 -05:00
Diego Biurrun
4015829acc
bit_depth_template: Use file name as multiple inclusion guard
...
(cherry picked from commit ba42c85247
)
2014-03-02 11:42:37 -05:00
Diego Biurrun
39dc4a6bb3
x86: dca: Add missing multiple inclusion guards
...
(cherry picked from commit b23bc95920
)
2014-03-02 11:42:37 -05:00
Lou Logan
a6a2d8eb8f
qt-faststart: Add a note about the -movflags +faststart feature
...
Signed-off-by: Martin Storsjö <martin@martin.st >
(cherry picked from commit 700687ebe0
)
2014-03-02 11:42:37 -05:00
Anton Khirnov
58556826a8
af_volume: preserve frame properties
...
(cherry picked from commit 39c2880eea
)
2014-03-02 11:42:37 -05:00
Luca Barbato
bc2c9a479a
avconv: Do not divide by zero
...
(cherry picked from commit 5c79d2e12d
)
2014-03-02 11:42:37 -05:00
Diego Biurrun
9cc22be032
svq3: Adjust #endif comment
...
(cherry picked from commit 61e7c7f27b
)
2014-03-02 11:42:37 -05:00
Diego Biurrun
33e1bca651
gitignore: Add all examples below doc/examples
...
(cherry picked from commit 294a51e18a
)
2014-03-02 11:42:37 -05:00
Martin Storsjö
9841617b7f
qt-faststart: Avoid unintentionally sign extending BE_32
...
Without this cast, the BE_32() expression is sign extended when
assigned to an uint64_t, since the uint8_t|uint8_t expression
is promoted to an int.
Also avoid undefined behaviour when left shifting an uint8_t
by 24 by casting it to an uint32_t explicitly before shifting.
Based on a patch by Michael Niedermayer.
Signed-off-by: Martin Storsjö <martin@martin.st >
(cherry picked from commit ea7f79f937
)
2014-03-02 11:42:37 -05:00
Christophe Gisquet
2897481f64
dca: replace some memcpy by AV_COPY128
...
Signed-off-by: Janne Grunau <janne-libav@jannau.net >
(cherry picked from commit ef010f08ae
)
2014-03-02 11:42:37 -05:00
Luca Barbato
646c564de5
hevc: Mention the missing SPS in the error message
...
(cherry picked from commit 175e506332
)
2014-03-02 11:42:37 -05:00
Martin Storsjö
cd6281abef
arm: Mark the stack as non-executable
...
If linking in an object file without this attribute set, the
linker will assume that an executable stack might be needed.
Signed-off-by: Martin Storsjö <martin@martin.st >
(cherry picked from commit 543156d751
)
2014-03-02 11:42:37 -05:00
Janne Grunau
697be8173b
h264: avoid undefined behavior in chroma motion compensation
...
Makes fate-h264 pass under valgrind --undef-value-errors=yes with
-cpuflags none. {avg,put}_h264_chroma_mc8_8 approximately 5% faster,
{avg,put}_h264_chroma_mc4_8 2% faster both on x86 and arm.
(cherry picked from commit 982b596ea6
)
2014-03-02 11:42:37 -05:00
Luca Barbato
1853d8bb7a
doc: Name the MOV muxer as it should be called
...
The section name is the muxer, not the format.
(cherry picked from commit 93632a70f9
)
2014-03-02 11:42:37 -05:00
Diego Biurrun
1779cd7695
doxygen: Replace @parblock syntax with manual linebreaks
...
@parblock is only supported in very recent Doxygen versions.
(cherry picked from commit 2f2b2efd31
)
2014-03-02 11:42:37 -05:00
Diego Biurrun
bb4820727f
x86: dsputil: Use correct file name as multiple inclusion guard
...
(cherry picked from commit 017a06a9ee
)
2014-03-02 11:42:37 -05:00
Luca Barbato
affc7687d3
doc: Sort the muxer documentation
...
Keep the sections alphabetically sorted.
(cherry picked from commit a7b3216cbd
)
2014-03-02 11:42:37 -05:00
Diego Biurrun
3569470693
doxygen: Add a number of missing function parameter descriptions
...
(cherry picked from commit 4d7ab5cfeb
)
2014-03-02 11:42:37 -05:00
Anton Khirnov
1d1df82093
pthread_frame: flush all threads on flush, not just the first one
...
avcodec_flush_buffers() must release all internally held references
according to its documentation, for which all the threads need to be
flushed.
CC:libav-stable@libav.org
Bug-Id: vlc/9665
(cherry picked from commit d1f9563d50
)
2014-03-02 11:42:36 -05:00
Luca Barbato
de187e3e9e
h264: Fix a typo from the previous commit
...
f777504f64
changed a - in +
CC: libav-stable@libav.org
(cherry picked from commit d922c5a5fb
)
2014-03-02 11:42:36 -05:00
Michael Niedermayer
7754d48381
qt-faststart: Check offset_count before reading from the moov_atom buffer
...
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st >
(cherry picked from commit bb95334c34
)
2014-03-02 11:42:36 -05:00
Vittorio Giovara
63169474b3
h264: Lower bound check for slice offsets
...
And use the value from the specification.
Sample-Id: 00000451-google
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
(cherry picked from commit f777504f64
)
2014-03-02 11:42:36 -05:00
Michael Niedermayer
b3f106cb1f
qt-faststart: Check the ftello() return codes
...
This silences a warning in the coverity static analyzer.
Signed-off-by: Martin Storsjö <martin@martin.st >
(cherry picked from commit 6384885425
)
2014-03-02 11:42:36 -05:00
Luca Barbato
9b6ccf0f24
hevc: Always consider VLC NALU type mismatch fatal
...
Sample-Id: 00001667-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 521726ff57
)
2014-03-02 11:42:36 -05:00
Michael Niedermayer
298d66c8de
qt-faststart: Fix the signedness of variables keeping the ftello return values
...
These variables are assigned the return values of ftello, which
returns an off_t, which is a signed type. On errors, ftello returns
-1, thus make sure this error return value can be stored properly.
Signed-off-by: Martin Storsjö <martin@martin.st >
(cherry picked from commit 03c2a66fcf
)
2014-03-02 11:42:36 -05:00
Reinhard Tartler
4be1b68d52
Prepare for 10_beta2 Release
2014-03-02 11:42:36 -05:00
Michael Niedermayer
92edc13d69
qt-faststart: Check fseeko() return codes
...
Signed-off-by: Martin Storsjö <martin@martin.st >
(cherry picked from commit 5612244351
)
2014-03-02 11:42:36 -05:00
Michael Niedermayer
c9f015f1c6
qt-faststart: Simplify code by using a MIN() macro
...
qt-faststart doesn't use the normal libav headers at all since
it's supposed to be a completely standalone tool, so we implement
the macro locally in this file.
Signed-off-by: Martin Storsjö <martin@martin.st >
(cherry picked from commit ea15a9a5d8
)
2014-03-02 11:42:36 -05:00
Martin Storsjö
db6b2ca0b3
qt-faststart: Increase the copy buffer size to 64 KB
...
Copying data in chunks of 1 KB is a little wasteful.
64 KB should still easily fit on the stack, so there's no need
to allocate it dynamically.
Signed-off-by: Martin Storsjö <martin@martin.st >
(cherry picked from commit 3cbc7ef3d6
)
2014-03-02 11:42:36 -05:00
Michael Niedermayer
3503ec8461
Changelog: remove <next>
...
Found-by: Timothy
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-01 18:26:04 +01:00
Michael Niedermayer
ecc5e42d92
Update for 2.2-rc1
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
n2.2-rc1
2014-03-01 04:03:08 +01:00
Michael Niedermayer
e4a6310cce
update for 2.2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-01 03:34:59 +01:00
Michael Niedermayer
0a8c90202b
avcodec/utvideoenc: fix slice_bits size
...
Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-01 02:57:15 +01:00
Michael Niedermayer
0c9dd939cd
avformat/ac3dec: Use avpriv_ac3_parse_header2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-01 01:56:25 +01:00
Michael Niedermayer
eadc21cfe7
avcodec/ac3_parser: add avpriv_ac3_parse_header2() and use it in libavcodec
...
The new function has the ability to allocate the structure, allowing it to grow
without needing major bumps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-01 01:51:01 +01:00
Michael Niedermayer
df6d21c1e7
avcodec/ac3: move new field to the end of AC3HeaderInfo
...
This structure is used in the interface between libs and thus cannot have
fields added in the middle without major bump
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-01 01:45:49 +01:00
Michael Niedermayer
52d928daf9
avutil/opt: allow max=min=0 for pixel formats
...
This is neccessary for maintaining ABI compatibility with FFmpeg 2.1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-01 00:31:38 +01:00
Michael Niedermayer
d46c3b8171
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
latm: Always reconfigure if no extradata was set previously
See: d039b6074c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-28 22:40:58 +01:00
Michael Niedermayer
fe6603745e
Merge commit '6e4009d4cdf5927bdaedf58fcfc5e813b14c366b'
...
* commit '6e4009d4cdf5927bdaedf58fcfc5e813b14c366b':
arm: dcadsp: implement decode_hf as external NEON asm
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-28 21:52:25 +01:00
Michael Niedermayer
fb3c33f3cd
Merge commit '4cb6964244fd6c099383d8b7e99731e72cc844b9'
...
* commit '4cb6964244fd6c099383d8b7e99731e72cc844b9':
dcadec: simplify decoding of VQ high frequencies
Conflicts:
configure
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-28 21:41:19 +01:00
Michael Niedermayer
ffb7d7195b
avcodec/dcadec: use brackets to ensure that no slow division is used
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-28 21:32:24 +01:00
Michael Niedermayer
747b0337e7
Merge commit '7686afd049be98d18663682b92d983340fa2c305'
...
* commit '7686afd049be98d18663682b92d983340fa2c305':
dca: factorize scaling in inverse ADPCM
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-28 21:32:14 +01:00
Michael Niedermayer
baf3adc621
Merge commit '08e3ea60ff4059341b74be04a428a38f7c3630b0'
...
* commit '08e3ea60ff4059341b74be04a428a38f7c3630b0':
x86: synth filter float: implement SSE2 version
Conflicts:
libavcodec/x86/dcadsp.asm
libavcodec/x86/dcadsp_init.c
See: 2cdbcc0048
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-28 20:38:39 +01:00
Christophe Gisquet
2cdbcc0048
x86: synth filter float: implement SSE2 version
...
Timings for Arrandale:
C SSE
win32: 2108 334
win64: 1152 322
Factorizing the inner loop with a call/jmp is a >15 cycles cost, even with
the jmp destination being aligned.
Unrolling for ARCH_X86_64 is a 20 cycles gain.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-28 20:34:40 +01:00
Michael Niedermayer
5333e0dd66
Merge commit '57b1eb9f75b04571063ddec316e290c216c114ac'
...
* commit '57b1eb9f75b04571063ddec316e290c216c114ac':
dcadsp: scan coefficients linearly in dca_lfe_fir
Conflicts:
libavcodec/dcadsp.c
See: 9ae8e23188
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-28 19:40:40 +01:00
Michael Niedermayer
e346a59383
Merge commit 'ad507d7907457e678900bac132122ba7be4644cb'
...
* commit 'ad507d7907457e678900bac132122ba7be4644cb':
x86: dcadsp: implement SSE lfe_dir
Conflicts:
libavcodec/x86/dcadsp.asm
See: 169243112c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-28 19:22:00 +01:00