Michael Niedermayer
d089e9a4d1
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
ffmpeg: make reading packets from thread blocking.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c427b2b86e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpeg4video_parser: Drop pointless av_-prefix from static function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
add54280bf
Merge commit '984e3398662d460e15904f9e4a6df9ef759070cb'
...
* commit '984e3398662d460e15904f9e4a6df9ef759070cb':
avcodec: Consistently name encoder init functions foo_encode_init
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Janne Grunau
9c029f67ca
aarch64: use EXTERN_ASM consistently for exported symbols
...
Based on e3fec3f095
for arm.
11 years ago
Michael Niedermayer
8372aaf721
Merge commit '017a06a9ee86b047079166c2694c9c655ff03356'
...
* commit '017a06a9ee86b047079166c2694c9c655ff03356':
x86: dsputil: Use correct file name as multiple inclusion guard
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a0cfec2e2b
Merge commit 'ba42c852477e87f6e47a5587e8f7829c46c52032'
...
* commit 'ba42c852477e87f6e47a5587e8f7829c46c52032':
bit_depth_template: Use file name as multiple inclusion guard
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e948f17369
Merge commit '61e7c7f27b0a2652bf5cd282b97762ee99d025ef'
...
* commit '61e7c7f27b0a2652bf5cd282b97762ee99d025ef':
svq3: Adjust #endif comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
fdba564585
Merge commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f'
...
* commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f':
build: The MPEG-4 video parser depends on h263dsp
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Christophe Gisquet
996697e266
x86: float dsp: unroll SSE versions
...
vector_fmul and vector_fmac_scalar are guaranteed that they can process in
batch of 16 elements, but their SSE versions only does 8 at a time.
Therefore, unroll them a bit.
299 to 261c for 256 elements in vector_fmac_scalar on Arrandale/Win64.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
11 years ago
Christophe Gisquet
ef010f08ae
dca: replace some memcpy by AV_COPY128
...
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
11 years ago
Janne Grunau
982b596ea6
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.
11 years ago
Diego Biurrun
4bcca3611d
mpeg4video_parser: Drop pointless av_-prefix from static function
11 years ago
Diego Biurrun
984e339866
avcodec: Consistently name encoder init functions foo_encode_init
11 years ago
Diego Biurrun
017a06a9ee
x86: dsputil: Use correct file name as multiple inclusion guard
11 years ago
Diego Biurrun
ba42c85247
bit_depth_template: Use file name as multiple inclusion guard
11 years ago
Diego Biurrun
61e7c7f27b
svq3: Adjust #endif comment
11 years ago
Diego Biurrun
192ccc5034
build: The MPEG-4 video parser depends on h263dsp
...
The dependency is indirect through the h263/mpegvideo code.
CC: libav-stable@libav.org
11 years ago
Nicolas George
299a56879d
ffmpeg: make reading packets from thread blocking.
...
If a packet is not ready on the input selected by ffmpeg,
it will read from another input instead. If that happens
repeatedly, frames will accumulate somewhere later in the
processing to ensure streams synchronization. It can happen
in particular when reading from a slow medium or an
expensive lavfi filter graph.
Make reading from normal demuxers on non-streamed data and
from the lavfi pseudo-device blocking to avoid that.
Should fix trac ticket #3079 .
11 years ago
Michael Niedermayer
3edc3b1595
avcodec/mpeg4videodec: Check for bitstream overread in decode_vol_header()
...
Fixes out of array read
Fixes: 08e48e9daae7d8f8ab6dbe3919e797e5-asan_heap-oob_157461c_5295_cov_1266798650_firefing.mpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Nicolas George
916a79227e
lavf/mux: check av_dup_packet() return value.
...
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cbd9cc5997
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/pan: use extended_data instead of data.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8f33810ed2
avfilter/vf_fps: fix rounding error accumulation
...
Fixes Ticket3329
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c849b00b80
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libavformat/mpegts: expose raw packet size
Conflicts:
libavformat/mpegts.c
See: f9b997c337
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6a24d77929
Merge commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1'
...
* commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1':
AVOptions: add flags for read/read-only options
Conflicts:
libavutil/opt.c
libavutil/opt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f4c8d00223
Merge commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0'
...
* commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0':
AVOptions: deprecate unused AV_OPT_FLAG_METADATA
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ca9f7e1832
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
hevc: Always consider VLC NALU type mismatch fatal
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ef08d554e0
Merge commit '175e5063320f585118a5461f15dbacf2ce17e97d'
...
* commit '175e5063320f585118a5461f15dbacf2ce17e97d':
hevc: Mention the missing SPS in the error message
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4ba03e37fd
Merge commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd'
...
* commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd':
doc: Name the MOV muxer as it should be called
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ca5b45b9b3
Merge commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba'
...
* commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba':
doc: Sort the muxer documentation
Conflicts:
doc/muxers.texi
No change as ours was already sorted
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0a30ad3473
Merge commit '874c751cc5b99cd68932e21c2c3a0d21134207e0'
...
* commit '874c751cc5b99cd68932e21c2c3a0d21134207e0':
threads: Check w32threads dependencies at the configure stage
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Leandro Dorileo
8370a6fa59
libavformat/mpegts: expose raw packet size
...
We cannot easily determine if an mpeg TS's packet size is DVHS, FEC
or so on, for that we need to expose the internal raw_packet_size
field.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Anton Khirnov
c3ecd968f0
AVOptions: add flags for read/read-only options
11 years ago
Anton Khirnov
6bb8720f00
AVOptions: deprecate unused AV_OPT_FLAG_METADATA
...
It was never used since it was added and the things it was intended for
are now exported differently.
11 years ago
Michael Niedermayer
4332b01c30
avcodec/huffyuv: simplify allocation of temporaries
...
This also fixes a null pointer dereference with rgb and plane prediction
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
a88dee8eea
Add decklink_enc.h to SKIPHEADERS.
...
Fixes make checkheaders without decklink headers.
11 years ago
Michael Niedermayer
3734c3ea51
ffmpeg: reduce frame rate for mpeg4 to be within the spec limits
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2969fb4393
avformat/utils: av_guess_frame_rate() favor avg_frame_rate if r_frame_rate has a comparably unlikely value
...
Fixes Ticket3399
Fixes Ticket2958
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
9c070ae03e
Fix dctdnoiz dependencies, the filter should select dct, not fft.
...
Fixes compilation with --disable-everything --enable-filter=dctdnoiz
11 years ago
Luca Barbato
521726ff57
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
11 years ago
Luca Barbato
175e506332
hevc: Mention the missing SPS in the error message
11 years ago
Luca Barbato
93632a70f9
doc: Name the MOV muxer as it should be called
...
The section name is the muxer, not the format.
11 years ago
Luca Barbato
a7b3216cbd
doc: Sort the muxer documentation
...
Keep the sections alphabetically sorted.
11 years ago
Michael Niedermayer
b14517d3cd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_interlace: deprecate lowpass option
Conflicts:
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
130c33af35
Merge commit 'b23bc95920e2f10b9621857e829c45b064f356c0'
...
* commit 'b23bc95920e2f10b9621857e829c45b064f356c0':
x86: dca: Add missing multiple inclusion guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Diego Biurrun
874c751cc5
threads: Check w32threads dependencies at the configure stage
...
Also add warning comment about threading implementations without matching
atomics implementation to the atomics fallback implementation.
11 years ago
Michael Niedermayer
d808dce4a9
Merge commit '294a51e18ab7df4d658249361a03f0d716a4e9f0'
...
* commit '294a51e18ab7df4d658249361a03f0d716a4e9f0':
gitignore: Add all examples below doc/examples
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
3f461566b7
avformat/movenc: simplify code, decrease difference to libav
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ef1aae6ea9
Merge commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66'
...
* commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66':
movenc: Add a fallback fragmentation method for plain mp4 as well
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
53d11f7b2d
Merge commit '543156d7518f5e5d731123da066d86278f9fa492'
...
* commit '543156d7518f5e5d731123da066d86278f9fa492':
arm: Mark the stack as non-executable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
36fb07d1ab
avcodec/mpeg4videodec: set field durations to safe values when they are invalid
...
Fixes division by 0
Fixes: 3c980274cecaca6ca5d6e517c0c1983e-signal_sigabrt_7ffff7125425_410_cov_3621042467_2_audio_streams.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago