]> git.sesse.net Git - ffmpeg/log
ffmpeg
10 years agoDo not warn about missing start time for unknown streams.
Carl Eugen Hoyos [Fri, 21 Feb 2014 16:27:37 +0000 (17:27 +0100)]
Do not warn about missing start time for unknown streams.

10 years agoOnly complain about missing frame rate for video streams.
Carl Eugen Hoyos [Fri, 21 Feb 2014 16:27:20 +0000 (17:27 +0100)]
Only complain about missing frame rate for video streams.

10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 21 Feb 2014 12:53:24 +0000 (13:53 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libvorbis: Give consistent names to all functions, structs, and defines

Conflicts:
libavcodec/libvorbisenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agolibvorbis: Give consistent names to all functions, structs, and defines
Diego Biurrun [Fri, 21 Feb 2014 10:08:09 +0000 (11:08 +0100)]
libvorbis: Give consistent names to all functions, structs, and defines

10 years agoavformat/movenc: assert that get_cluster_duration() value is valid
Michael Niedermayer [Fri, 21 Feb 2014 01:15:58 +0000 (02:15 +0100)]
avformat/movenc: assert that get_cluster_duration() value is valid

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/movenc: check that the input timestamps are within the range that can be...
Michael Niedermayer [Fri, 21 Feb 2014 01:30:19 +0000 (02:30 +0100)]
avformat/movenc: check that the input timestamps are within the range that can be stored in mov

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/h264: fix sign error
Michael Niedermayer [Thu, 20 Feb 2014 23:33:23 +0000 (00:33 +0100)]
avcodec/h264: fix sign error

regression since f777504f640260337974848c7d5d7a3f064bbb45

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec: fix dxva2 & vaapi after removing the +52 offset from the loop filter parameters
Michael Niedermayer [Thu, 20 Feb 2014 23:21:22 +0000 (00:21 +0100)]
avcodec: fix dxva2 & vaapi after removing the +52 offset from the loop filter parameters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 20 Feb 2014 23:19:07 +0000 (00:19 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: Lower bound check for slice offsets

Conflicts:
libavcodec/h264.c

See: 91253839e14cce9793ee93f184cef609ca8195d5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '5c79d2e12d13959fc6aed92d102c25194a06de05'
Michael Niedermayer [Thu, 20 Feb 2014 22:58:40 +0000 (23:58 +0100)]
Merge commit '5c79d2e12d13959fc6aed92d102c25194a06de05'

* commit '5c79d2e12d13959fc6aed92d102c25194a06de05':
  avconv: Do not divide by zero

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'd6a27f885b5d4cba7a82e50af423c741d2f37c3e'
Michael Niedermayer [Thu, 20 Feb 2014 22:38:30 +0000 (23:38 +0100)]
Merge commit 'd6a27f885b5d4cba7a82e50af423c741d2f37c3e'

* commit 'd6a27f885b5d4cba7a82e50af423c741d2f37c3e':
  configure: Add usan to the toolchain presets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0'
Michael Niedermayer [Thu, 20 Feb 2014 22:27:13 +0000 (23:27 +0100)]
Merge commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0'

* commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0':
  configure: Move cpunop into ARCH_EXT_LIST_X86

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '6adf4290ebcf65ac8243d74f34ba0a508f561633'
Michael Niedermayer [Thu, 20 Feb 2014 22:18:02 +0000 (23:18 +0100)]
Merge commit '6adf4290ebcf65ac8243d74f34ba0a508f561633'

* commit '6adf4290ebcf65ac8243d74f34ba0a508f561633':
  configure: Move inet_aton check into network function check block

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4'
Michael Niedermayer [Thu, 20 Feb 2014 22:13:06 +0000 (23:13 +0100)]
Merge commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4'

* commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4':
  aarch64: use EXTERN_ASM consistently for exported symbols

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '996697e266c8adc0ad9b7fc7568406c7529c97cf'
Michael Niedermayer [Thu, 20 Feb 2014 22:11:19 +0000 (23:11 +0100)]
Merge commit '996697e266c8adc0ad9b7fc7568406c7529c97cf'

* commit '996697e266c8adc0ad9b7fc7568406c7529c97cf':
  x86: float dsp: unroll SSE versions

See: 133b34207c2ca3ae214dfd429288ac6e31efa5dc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'ef010f08ae53479c54e2f16be5a7e1a809a9e268'
Michael Niedermayer [Thu, 20 Feb 2014 22:07:15 +0000 (23:07 +0100)]
Merge commit 'ef010f08ae53479c54e2f16be5a7e1a809a9e268'

* commit 'ef010f08ae53479c54e2f16be5a7e1a809a9e268':
  dca: replace some memcpy by AV_COPY128

See: 5a48caa34b0c2a2641ea3bd522802fa1df2c8866
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '982b596ea6640bfe218a31f6c3fc542d9fe61c31'
Michael Niedermayer [Thu, 20 Feb 2014 21:48:00 +0000 (22:48 +0100)]
Merge commit '982b596ea6640bfe218a31f6c3fc542d9fe61c31'

* commit '982b596ea6640bfe218a31f6c3fc542d9fe61c31':
  h264: avoid undefined behavior in chroma motion compensation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoh264: Lower bound check for slice offsets
Vittorio Giovara [Thu, 20 Feb 2014 01:38:32 +0000 (02:38 +0100)]
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>
10 years agoavconv: Do not divide by zero
Luca Barbato [Wed, 19 Feb 2014 20:41:12 +0000 (21:41 +0100)]
avconv: Do not divide by zero

10 years agoconfigure: Add usan to the toolchain presets
Luca Barbato [Wed, 19 Feb 2014 19:20:39 +0000 (20:20 +0100)]
configure: Add usan to the toolchain presets

clang-3.4 and gcc-4.9 have it.

10 years agoconfigure: Move cpunop into ARCH_EXT_LIST_X86
Diego Biurrun [Sat, 2 Nov 2013 16:21:52 +0000 (17:21 +0100)]
configure: Move cpunop into ARCH_EXT_LIST_X86

It is a processor feature, so it belongs there.

10 years agoconfigure: Move inet_aton check into network function check block
Diego Biurrun [Sat, 2 Nov 2013 16:21:50 +0000 (17:21 +0100)]
configure: Move inet_aton check into network function check block

10 years agoavformat/mov: make invalid sampledelta error more verbose
Michael Niedermayer [Thu, 20 Feb 2014 17:04:44 +0000 (18:04 +0100)]
avformat/mov: make invalid sampledelta error more verbose

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Thu, 20 Feb 2014 15:29:09 +0000 (16:29 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  ffmpeg: make reading packets from thread blocking.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 20 Feb 2014 14:42:50 +0000 (15:42 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpeg4video_parser: Drop pointless av_-prefix from static function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '984e3398662d460e15904f9e4a6df9ef759070cb'
Michael Niedermayer [Thu, 20 Feb 2014 14:22:37 +0000 (15:22 +0100)]
Merge commit '984e3398662d460e15904f9e4a6df9ef759070cb'

* commit '984e3398662d460e15904f9e4a6df9ef759070cb':
  avcodec: Consistently name encoder init functions foo_encode_init

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoaarch64: use EXTERN_ASM consistently for exported symbols
Janne Grunau [Fri, 7 Feb 2014 15:05:50 +0000 (16:05 +0100)]
aarch64: use EXTERN_ASM consistently for exported symbols

Based on e3fec3f095ab5ea08ee662942d98526aaf5e3635 for arm.

10 years agoMerge commit '017a06a9ee86b047079166c2694c9c655ff03356'
Michael Niedermayer [Thu, 20 Feb 2014 13:57:58 +0000 (14:57 +0100)]
Merge commit '017a06a9ee86b047079166c2694c9c655ff03356'

* commit '017a06a9ee86b047079166c2694c9c655ff03356':
  x86: dsputil: Use correct file name as multiple inclusion guard

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'ba42c852477e87f6e47a5587e8f7829c46c52032'
Michael Niedermayer [Thu, 20 Feb 2014 13:46:28 +0000 (14:46 +0100)]
Merge commit 'ba42c852477e87f6e47a5587e8f7829c46c52032'

* commit 'ba42c852477e87f6e47a5587e8f7829c46c52032':
  bit_depth_template: Use file name as multiple inclusion guard

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '61e7c7f27b0a2652bf5cd282b97762ee99d025ef'
Michael Niedermayer [Thu, 20 Feb 2014 13:44:40 +0000 (14:44 +0100)]
Merge commit '61e7c7f27b0a2652bf5cd282b97762ee99d025ef'

* commit '61e7c7f27b0a2652bf5cd282b97762ee99d025ef':
  svq3: Adjust #endif comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f'
Michael Niedermayer [Thu, 20 Feb 2014 13:39:33 +0000 (14:39 +0100)]
Merge commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f'

* commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f':
  build: The MPEG-4 video parser depends on h263dsp

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agox86: float dsp: unroll SSE versions
Christophe Gisquet [Fri, 14 Feb 2014 15:03:12 +0000 (15:03 +0000)]
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>
10 years agodca: replace some memcpy by AV_COPY128
Christophe Gisquet [Fri, 14 Feb 2014 15:03:10 +0000 (15:03 +0000)]
dca: replace some memcpy by AV_COPY128

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
10 years agoh264: avoid undefined behavior in chroma motion compensation
Janne Grunau [Fri, 14 Feb 2014 16:00:06 +0000 (17:00 +0100)]
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.

10 years agompeg4video_parser: Drop pointless av_-prefix from static function
Diego Biurrun [Thu, 20 Feb 2014 10:27:21 +0000 (02:27 -0800)]
mpeg4video_parser: Drop pointless av_-prefix from static function

10 years agoavcodec: Consistently name encoder init functions foo_encode_init
Diego Biurrun [Thu, 6 Feb 2014 17:29:51 +0000 (18:29 +0100)]
avcodec: Consistently name encoder init functions foo_encode_init

10 years agox86: dsputil: Use correct file name as multiple inclusion guard
Diego Biurrun [Mon, 23 Dec 2013 15:39:36 +0000 (16:39 +0100)]
x86: dsputil: Use correct file name as multiple inclusion guard

10 years agobit_depth_template: Use file name as multiple inclusion guard
Diego Biurrun [Sun, 22 Dec 2013 13:19:28 +0000 (14:19 +0100)]
bit_depth_template: Use file name as multiple inclusion guard

10 years agosvq3: Adjust #endif comment
Diego Biurrun [Tue, 28 Jan 2014 07:23:02 +0000 (08:23 +0100)]
svq3: Adjust #endif comment

10 years agobuild: The MPEG-4 video parser depends on h263dsp
Diego Biurrun [Wed, 19 Feb 2014 19:33:28 +0000 (20:33 +0100)]
build: The MPEG-4 video parser depends on h263dsp

The dependency is indirect through the h263/mpegvideo code.
CC: libav-stable@libav.org
10 years agoffmpeg: make reading packets from thread blocking.
Nicolas George [Fri, 25 Oct 2013 08:58:14 +0000 (10:58 +0200)]
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.

10 years agoavcodec/mpeg4videodec: Check for bitstream overread in decode_vol_header()
Michael Niedermayer [Thu, 20 Feb 2014 04:48:54 +0000 (05:48 +0100)]
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>
10 years agolavf/mux: check av_dup_packet() return value.
Nicolas George [Wed, 19 Feb 2014 16:43:46 +0000 (17:43 +0100)]
lavf/mux: check av_dup_packet() return value.

Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Thu, 20 Feb 2014 01:53:36 +0000 (02:53 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/pan: use extended_data instead of data.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavfilter/vf_fps: fix rounding error accumulation
Michael Niedermayer [Sat, 25 Jan 2014 22:23:28 +0000 (23:23 +0100)]
avfilter/vf_fps: fix rounding error accumulation

Fixes Ticket3329

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 20 Feb 2014 01:10:05 +0000 (02:10 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libavformat/mpegts: expose raw packet size

Conflicts:
libavformat/mpegts.c

See: f9b997c337873dad99f7fd505588b260febaf32b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1'
Michael Niedermayer [Thu, 20 Feb 2014 01:01:13 +0000 (02:01 +0100)]
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>
10 years agoMerge commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0'
Michael Niedermayer [Thu, 20 Feb 2014 00:50:26 +0000 (01:50 +0100)]
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>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 19 Feb 2014 21:31:10 +0000 (22:31 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hevc: Always consider VLC NALU type mismatch fatal

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '175e5063320f585118a5461f15dbacf2ce17e97d'
Michael Niedermayer [Wed, 19 Feb 2014 21:10:00 +0000 (22:10 +0100)]
Merge commit '175e5063320f585118a5461f15dbacf2ce17e97d'

* commit '175e5063320f585118a5461f15dbacf2ce17e97d':
  hevc: Mention the missing SPS in the error message

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd'
Michael Niedermayer [Wed, 19 Feb 2014 21:09:10 +0000 (22:09 +0100)]
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>
10 years agoMerge commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba'
Michael Niedermayer [Wed, 19 Feb 2014 21:06:12 +0000 (22:06 +0100)]
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>
10 years agoMerge commit '874c751cc5b99cd68932e21c2c3a0d21134207e0'
Michael Niedermayer [Wed, 19 Feb 2014 20:53:42 +0000 (21:53 +0100)]
Merge commit '874c751cc5b99cd68932e21c2c3a0d21134207e0'

* commit '874c751cc5b99cd68932e21c2c3a0d21134207e0':
  threads: Check w32threads dependencies at the configure stage

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agolibavformat/mpegts: expose raw packet size
Leandro Dorileo [Fri, 31 Jan 2014 16:48:11 +0000 (14:48 -0200)]
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>
10 years agoAVOptions: add flags for read/read-only options
Anton Khirnov [Sat, 15 Feb 2014 07:24:23 +0000 (08:24 +0100)]
AVOptions: add flags for read/read-only options

10 years agoAVOptions: deprecate unused AV_OPT_FLAG_METADATA
Anton Khirnov [Sat, 15 Feb 2014 07:14:03 +0000 (08:14 +0100)]
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.

10 years agoavcodec/huffyuv: simplify allocation of temporaries
Michael Niedermayer [Wed, 19 Feb 2014 19:19:38 +0000 (20:19 +0100)]
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>
10 years agoAdd decklink_enc.h to SKIPHEADERS.
Carl Eugen Hoyos [Wed, 19 Feb 2014 18:55:14 +0000 (19:55 +0100)]
Add decklink_enc.h to SKIPHEADERS.

Fixes make checkheaders without decklink headers.

10 years agoffmpeg: reduce frame rate for mpeg4 to be within the spec limits
Michael Niedermayer [Wed, 19 Feb 2014 17:36:00 +0000 (18:36 +0100)]
ffmpeg: reduce frame rate for mpeg4 to be within the spec limits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/utils: av_guess_frame_rate() favor avg_frame_rate if r_frame_rate has a...
Michael Niedermayer [Wed, 19 Feb 2014 17:20:13 +0000 (18:20 +0100)]
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>
10 years agoFix dctdnoiz dependencies, the filter should select dct, not fft.
Carl Eugen Hoyos [Wed, 19 Feb 2014 16:27:36 +0000 (17:27 +0100)]
Fix dctdnoiz dependencies, the filter should select dct, not fft.

Fixes compilation with --disable-everything --enable-filter=dctdnoiz

10 years agohevc: Always consider VLC NALU type mismatch fatal
Luca Barbato [Tue, 18 Feb 2014 22:58:59 +0000 (23:58 +0100)]
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
10 years agohevc: Mention the missing SPS in the error message
Luca Barbato [Tue, 18 Feb 2014 22:55:29 +0000 (23:55 +0100)]
hevc: Mention the missing SPS in the error message

10 years agodoc: Name the MOV muxer as it should be called
Luca Barbato [Tue, 18 Feb 2014 20:57:12 +0000 (21:57 +0100)]
doc: Name the MOV muxer as it should be called

The section name is the muxer, not the format.

10 years agodoc: Sort the muxer documentation
Luca Barbato [Tue, 18 Feb 2014 16:12:30 +0000 (17:12 +0100)]
doc: Sort the muxer documentation

Keep the sections alphabetically sorted.

10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 19 Feb 2014 15:16:41 +0000 (16:16 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_interlace: deprecate lowpass option

Conflicts:
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'b23bc95920e2f10b9621857e829c45b064f356c0'
Michael Niedermayer [Wed, 19 Feb 2014 14:44:36 +0000 (15:44 +0100)]
Merge commit 'b23bc95920e2f10b9621857e829c45b064f356c0'

* commit 'b23bc95920e2f10b9621857e829c45b064f356c0':
  x86: dca: Add missing multiple inclusion guards

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agothreads: Check w32threads dependencies at the configure stage
Diego Biurrun [Wed, 18 Dec 2013 21:29:25 +0000 (22:29 +0100)]
threads: Check w32threads dependencies at the configure stage

Also add warning comment about threading implementations without matching
atomics implementation to the atomics fallback implementation.

10 years agoMerge commit '294a51e18ab7df4d658249361a03f0d716a4e9f0'
Michael Niedermayer [Wed, 19 Feb 2014 13:31:26 +0000 (14:31 +0100)]
Merge commit '294a51e18ab7df4d658249361a03f0d716a4e9f0'

* commit '294a51e18ab7df4d658249361a03f0d716a4e9f0':
  gitignore: Add all examples below doc/examples

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/movenc: simplify code, decrease difference to libav
Michael Niedermayer [Wed, 19 Feb 2014 13:20:22 +0000 (14:20 +0100)]
avformat/movenc: simplify code, decrease difference to libav

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66'
Michael Niedermayer [Wed, 19 Feb 2014 13:19:45 +0000 (14:19 +0100)]
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>
10 years agoMerge commit '543156d7518f5e5d731123da066d86278f9fa492'
Michael Niedermayer [Wed, 19 Feb 2014 13:01:25 +0000 (14:01 +0100)]
Merge commit '543156d7518f5e5d731123da066d86278f9fa492'

* commit '543156d7518f5e5d731123da066d86278f9fa492':
  arm: Mark the stack as non-executable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/mpeg4videodec: set field durations to safe values when they are invalid
Michael Niedermayer [Wed, 19 Feb 2014 04:54:54 +0000 (05:54 +0100)]
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>
10 years agovf_interlace: deprecate lowpass option
Vittorio Giovara [Fri, 14 Feb 2014 04:57:47 +0000 (05:57 +0100)]
vf_interlace: deprecate lowpass option

10 years agolavfi/pan: use extended_data instead of data.
Nicolas George [Tue, 11 Feb 2014 14:15:58 +0000 (15:15 +0100)]
lavfi/pan: use extended_data instead of data.

Fix trac ticket #3380.

10 years agox86: dca: Add missing multiple inclusion guards
Diego Biurrun [Tue, 18 Feb 2014 13:30:04 +0000 (14:30 +0100)]
x86: dca: Add missing multiple inclusion guards

10 years agogitignore: Add all examples below doc/examples
Diego Biurrun [Tue, 18 Feb 2014 17:37:48 +0000 (18:37 +0100)]
gitignore: Add all examples below doc/examples

10 years agomovenc: Add a fallback fragmentation method for plain mp4 as well
Martin Storsjö [Tue, 18 Feb 2014 14:11:59 +0000 (16:11 +0200)]
movenc: Add a fallback fragmentation method for plain mp4 as well

Previously the default fragmentation method was only enabled
if writing an ISM file.

Signed-off-by: Martin Storsjö <martin@martin.st>
10 years agoarm: Mark the stack as non-executable
Martin Storsjö [Fri, 7 Feb 2014 14:22:54 +0000 (16:22 +0200)]
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>
10 years agotiny_ssim: add per-frame metrics and final ssim db number.
Ronald S. Bultje [Mon, 17 Feb 2014 22:54:37 +0000 (17:54 -0500)]
tiny_ssim: add per-frame metrics and final ssim db number.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 19 Feb 2014 01:24:52 +0000 (02:24 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: informative error reporting in decode_slice_header()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '96f9fbe10933944b3eba86efa1d1ca094f2c28f8'
Michael Niedermayer [Wed, 19 Feb 2014 01:24:09 +0000 (02:24 +0100)]
Merge commit '96f9fbe10933944b3eba86efa1d1ca094f2c28f8'

* commit '96f9fbe10933944b3eba86efa1d1ca094f2c28f8':
  h264: fix slice_type value reported in decode_slice_header()

See: ec51b3308effbd0f434db87efabe600cd1f8cb36
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoh264: informative error reporting in decode_slice_header()
Luca Barbato [Tue, 18 Feb 2014 22:47:55 +0000 (23:47 +0100)]
h264: informative error reporting in decode_slice_header()

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
10 years agoh264: fix slice_type value reported in decode_slice_header()
Luca Barbato [Tue, 18 Feb 2014 22:47:32 +0000 (23:47 +0100)]
h264: fix slice_type value reported in decode_slice_header()

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
10 years agoavutil/opt: preserve fractions in set_string_number()
Michael Niedermayer [Tue, 18 Feb 2014 20:43:57 +0000 (21:43 +0100)]
avutil/opt: preserve fractions in set_string_number()

This avoids going over a double precission float, which may loose precission

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoffmpeg: support setting the chroma intra matrix
Michael Niedermayer [Mon, 10 Feb 2014 18:02:01 +0000 (19:02 +0100)]
ffmpeg: support setting the chroma intra matrix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec: support setting the chroma intra matrix
Michael Niedermayer [Mon, 10 Feb 2014 18:01:41 +0000 (19:01 +0100)]
avcodec: support setting the chroma intra matrix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/exr: read layers
Gonzalo Garramuno [Mon, 17 Feb 2014 17:53:30 +0000 (14:53 -0300)]
avcodec/exr: read layers

EXR files have, like tiffs, multiple channels and layers.  I have a
patch for exr.c that allows you to select the layer you want to process
thru a -layer flag.  It is not bulletproof but works for all layers that
have 3 channels in them (normals, motion vectors, etc).
The calling convention for ffmpeg is:

ffmpeg -layer Diffuse -i myexr.%d.exr test.mov

Here's an exr image with multiple layers:

http://www.datafilehost.com/d/e45d9a1c

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agovp9/x86: set correct number of registers used in intra pred asm
Hendrik Leppkes [Mon, 17 Feb 2014 20:57:42 +0000 (21:57 +0100)]
vp9/x86: set correct number of registers used in intra pred asm

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/huffyuvdec: use RGB0 for 24bit rgb output instead of BGRA
Michael Niedermayer [Tue, 18 Feb 2014 15:07:54 +0000 (16:07 +0100)]
avcodec/huffyuvdec: use RGB0 for 24bit rgb output instead of BGRA

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 18 Feb 2014 14:06:46 +0000 (15:06 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix libswresample compilation with Apple Neon assembler.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/huffyuvdec: use the correct height field
Michael Niedermayer [Tue, 18 Feb 2014 12:51:25 +0000 (13:51 +0100)]
avcodec/huffyuvdec: use the correct height field

Fixes Ticket3395

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/snow: split block clipping checks
Michael Niedermayer [Tue, 18 Feb 2014 01:53:14 +0000 (02:53 +0100)]
avcodec/snow: split block clipping checks

Fixes out of array read
Fixes: d4476f68ca1c1c57afbc45806f581963-asan_heap-oob_2266b27_8607_cov_4044577381_snow_chroma_bug.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/bink: Check return value of av_add_index_entry()
Michael Niedermayer [Mon, 17 Feb 2014 22:44:49 +0000 (23:44 +0100)]
avformat/bink: Check return value of av_add_index_entry()

Fixes null pointer dereference
Fixes: cdbf15cbd0a27cee958dd0b8800e452e-signal_sigsegv_737991_2083_cov_317652874_LBSTART.BIK
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 17 Feb 2014 20:20:38 +0000 (21:20 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doxygen: Replace @parblock syntax with manual linebreaks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53'
Michael Niedermayer [Mon, 17 Feb 2014 20:11:29 +0000 (21:11 +0100)]
Merge commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53'

* commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53':
  doxygen: Add a number of missing function parameter descriptions

Conflicts:
libavformat/avformat.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e'
Michael Niedermayer [Mon, 17 Feb 2014 19:59:51 +0000 (20:59 +0100)]
Merge commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e'

* commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e':
  h264: use avpriv_request_sample for chroma_format_idc

Conflicts:
libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/ansi: fix integer overflow
Michael Niedermayer [Mon, 17 Feb 2014 19:49:42 +0000 (20:49 +0100)]
avcodec/ansi: fix integer overflow

Fixes out of array read
Fixes: 5f9698e86d92f19bb08d54ff0d57027f-signal_sigsegv_b30756_3795_cov_2693691257_ansi256.ans
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/vp8dsp: evaluate CONFIG_VP7_DECODER/CONFIG_VP8_DECODER
Peter Ross [Sun, 16 Feb 2014 04:34:23 +0000 (15:34 +1100)]
avcodec/vp8dsp: evaluate CONFIG_VP7_DECODER/CONFIG_VP8_DECODER

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoFix libswresample compilation with Apple Neon assembler.
Reimar Döffinger [Mon, 17 Feb 2014 16:40:10 +0000 (17:40 +0100)]
Fix libswresample compilation with Apple Neon assembler.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>