ffmpeg.git
7 years agoMerge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c'
Michael Niedermayer [Mon, 21 Jan 2013 13:00:03 +0000 (14:00 +0100)]
Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c'

* commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c':
  rtpdec: Move setting the parsing flags to the actual depacketizers
  rtpdec: Split handling of mpeg12 audio/video to a separate depacketizer

Conflicts:
libavformat/rtpdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '2326558d5277ec87ba6d607a01ec6acfc51c694c'
Michael Niedermayer [Mon, 21 Jan 2013 12:52:06 +0000 (13:52 +0100)]
Merge commit '2326558d5277ec87ba6d607a01ec6acfc51c694c'

* commit '2326558d5277ec87ba6d607a01ec6acfc51c694c':
  rtpdec: Split mpegts parsing to a normal depacketizer
  rtpdec: Reorder payload handler registration alphabetically

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a717f9904227d7979473bad40c50eb40af41d01d'
Michael Niedermayer [Mon, 21 Jan 2013 12:45:32 +0000 (13:45 +0100)]
Merge commit 'a717f9904227d7979473bad40c50eb40af41d01d'

* commit 'a717f9904227d7979473bad40c50eb40af41d01d':
  mpegts: Share the cleanup code between the demuxer and lavf-internal parser functions
  rtpdec_mpeg4: Return one AAC AU per AVPacket
  ppc: Include string.h for memset

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '68f18f03519ae550e25cf12661172641e9f0eaca'
Michael Niedermayer [Mon, 21 Jan 2013 12:38:57 +0000 (13:38 +0100)]
Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca'

* commit '68f18f03519ae550e25cf12661172641e9f0eaca':
  videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
  dsputil: drop non-compliant "fast" qpel mc functions
  get_bits: change the failure condition in init_get_bits

Conflicts:
libavcodec/get_bits.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoEVRC decoder
Paul B Mahol [Wed, 9 Jan 2013 10:56:18 +0000 (10:56 +0000)]
EVRC decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agooggdec: #if 0 disabled code
Michael Niedermayer [Sun, 20 Jan 2013 16:50:17 +0000 (17:50 +0100)]
oggdec: #if 0 disabled code

Fixes CID968589
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofix memory leak on string reassign
Micah Galizia [Mon, 21 Jan 2013 01:25:30 +0000 (20:25 -0500)]
fix memory leak on string reassign

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fixes CID968584 and CID968585

7 years agoswr: support first_pts
Michael Niedermayer [Sun, 20 Jan 2013 23:52:14 +0000 (00:52 +0100)]
swr: support first_pts

Trolled-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: fix null checking in avfilter_config_links()
Xi Wang [Sun, 20 Jan 2013 20:38:21 +0000 (15:38 -0500)]
lavfi: fix null checking in avfilter_config_links()

Move the first use of `link' after the null pointer check.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoClarify that the recommended audio squeezing/stretching filter is aresample.
Carl Eugen Hoyos [Sun, 20 Jan 2013 22:26:35 +0000 (23:26 +0100)]
Clarify that the recommended audio squeezing/stretching filter is aresample.

Fixes ticket #2036.

7 years agocafdec: fix overflow checking in read_header()
Xi Wang [Sun, 20 Jan 2013 20:26:12 +0000 (15:26 -0500)]
cafdec: fix overflow checking in read_header()

Several compilers such as clang/icc/pathscale will optimize the check
pos + size < pos (assuming size > 0) into false, since signed integer
overflow is undefined behavior in C.  This breaks overflow checking.
Use a safe precondition check instead.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowtvdec: fix integer overflow
Michael Niedermayer [Sun, 20 Jan 2013 19:59:30 +0000 (20:59 +0100)]
wtvdec: fix integer overflow

Fixes CID968583
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264/ff_generate_sliding_window_mmcos: fix use of uninitialized variable
Michael Niedermayer [Sun, 20 Jan 2013 19:02:35 +0000 (20:02 +0100)]
h264/ff_generate_sliding_window_mmcos: fix use of uninitialized variable

Fixes CID968587
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: print mismatching opcode details in check_opcodes()
Michael Niedermayer [Sun, 20 Jan 2013 19:01:39 +0000 (20:01 +0100)]
h264: print mismatching opcode details in check_opcodes()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: fix use of uninitialized variable
Michael Niedermayer [Sun, 20 Jan 2013 18:50:33 +0000 (19:50 +0100)]
h264: fix use of uninitialized variable

Fixed CID968588

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotheora: support midstream reconfiguration
Michael Niedermayer [Wed, 16 Jan 2013 19:02:37 +0000 (20:02 +0100)]
theora: support midstream reconfiguration

Fixes Ticket868

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggdec: Support chained streams, support replacing streams in multistream files.
Michael Niedermayer [Wed, 16 Jan 2013 18:58:59 +0000 (19:58 +0100)]
oggdec: Support chained streams, support replacing streams in multistream files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Conflicts:

Changelog

7 years agortpdec: Move setting the parsing flags to the actual depacketizers
Martin Storsjö [Thu, 17 Jan 2013 13:29:12 +0000 (15:29 +0200)]
rtpdec: Move setting the parsing flags to the actual depacketizers

This gets rid of almost all the codec specific details from the
generic rtpdec code.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpdec: Split handling of mpeg12 audio/video to a separate depacketizer
Martin Storsjö [Thu, 17 Jan 2013 13:08:03 +0000 (15:08 +0200)]
rtpdec: Split handling of mpeg12 audio/video to a separate depacketizer

This also adds checking of mallocs.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpdec: Split mpegts parsing to a normal depacketizer
Martin Storsjö [Thu, 17 Jan 2013 12:34:59 +0000 (14:34 +0200)]
rtpdec: Split mpegts parsing to a normal depacketizer

This gets rid of a number of special cases from the common rtpdec
code.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpdec: Reorder payload handler registration alphabetically
Martin Storsjö [Thu, 17 Jan 2013 12:27:14 +0000 (14:27 +0200)]
rtpdec: Reorder payload handler registration alphabetically

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agovc1dec: add assert to impossible *_valid combination.
Michael Niedermayer [Sun, 20 Jan 2013 16:14:25 +0000 (17:14 +0100)]
vc1dec: add assert to impossible *_valid combination.

This also fixes a warning about uninitialized variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts: Share the cleanup code between the demuxer and lavf-internal parser functions
Martin Storsjö [Sat, 19 Jan 2013 23:59:08 +0000 (01:59 +0200)]
mpegts: Share the cleanup code between the demuxer and lavf-internal parser functions

The lavf-internal parser functions are used when receiving
mpegts over RTP. This fixes memory leaks in this setup.

The normal mpegts demuxer close function was updated in ec7d0d2e in
2004 to fix leaks, but the parsing function used for RTP wasn't
updated and has been leaking ever since.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpdec_mpeg4: Return one AAC AU per AVPacket
Martin Storsjö [Tue, 15 Jan 2013 14:58:48 +0000 (16:58 +0200)]
rtpdec_mpeg4: Return one AAC AU per AVPacket

This makes the returned data valid to stream copy into other
containers as well, not only for decoding straight away.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoppc: Include string.h for memset
Martin Storsjö [Sun, 20 Jan 2013 14:30:09 +0000 (16:30 +0200)]
ppc: Include string.h for memset

This fixes build failures on ppc machines with a compiler that
supports -Werror=implicit-function-declaration.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoswr: fix "may be used uninitialized in this function" warnings
Michael Niedermayer [Sun, 20 Jan 2013 16:09:48 +0000 (17:09 +0100)]
swr: fix "may be used uninitialized in this function" warnings

The uninitialized use implicates 0 channels, which is unlikely
to reach this function but fixed anyway in this commit.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovideodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
Janne Grunau [Sun, 20 Jan 2013 13:48:35 +0000 (14:48 +0100)]
videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL

libavutil/arm/asm.S sets '.arch' depending on HAVE_ARMV5TE so that
assembling armv5te code will always succeed even if the default -march
flag does not support it. HAVE_ARMV5TE_EXTERNAL tests assembling code
with the default arch.
Fixes the missing symbol ff_prefetch_arm with --cpu= not including
armv5te.

CC: libav-stable@libav.org
7 years agoh264: Only apply error concealment if theres a frame
Michael Niedermayer [Sun, 20 Jan 2013 14:03:13 +0000 (15:03 +0100)]
h264: Only apply error concealment if theres a frame

Without any correctly decoded slices, there can be no frame.

Fixes out of array reads

Found-by: Rafaël Carré
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodsputil: drop non-compliant "fast" qpel mc functions
Mans Rullgard [Fri, 18 Jan 2013 22:37:41 +0000 (23:37 +0100)]
dsputil: drop non-compliant "fast" qpel mc functions

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 20 Jan 2013 13:20:06 +0000 (14:20 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Remove put_no_rnd_pixels_l2 function pointer for w=16 from dsputil.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'fef906c77c09940a2fdad155b2adc05080e17eda'
Michael Niedermayer [Sun, 20 Jan 2013 13:07:51 +0000 (14:07 +0100)]
Merge commit 'fef906c77c09940a2fdad155b2adc05080e17eda'

* commit 'fef906c77c09940a2fdad155b2adc05080e17eda':
  Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.

Conflicts:
libavcodec/dsputil.c
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a'
Michael Niedermayer [Sun, 20 Jan 2013 12:57:10 +0000 (13:57 +0100)]
Merge commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a'

* commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a':
  vp3: integrate clear_blocks with idct of previous block.
  mpegvideo: fix loop condition in draw_line()
  dvdsubdec: parse the size from the extradata

Conflicts:
libavcodec/dvdsubdec.c
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoget_bits: change the failure condition in init_get_bits
Luca Barbato [Sun, 20 Jan 2013 04:10:32 +0000 (05:10 +0100)]
get_bits: change the failure condition in init_get_bits

Too much code relies in having init_get_bits fed with a valid
buffer and set its dimension to 0.

Check for NULL buffer instead.

7 years agoRemove put_no_rnd_pixels_l2 function pointer for w=16 from dsputil.
Ronald S. Bultje [Fri, 18 Jan 2013 06:02:58 +0000 (22:02 -0800)]
Remove put_no_rnd_pixels_l2 function pointer for w=16 from dsputil.

The function is never used.

7 years agoMove vorbis_inverse_coupling from dsputil to vorbisdspcontext.
Ronald S. Bultje [Sun, 20 Jan 2013 06:21:10 +0000 (22:21 -0800)]
Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.

Conveniently (together with Justin's earlier patches), this makes
our vorbis decoder entirely independent of dsputil.

7 years agovp3: integrate clear_blocks with idct of previous block.
Ronald S. Bultje [Fri, 18 Jan 2013 15:43:04 +0000 (16:43 +0100)]
vp3: integrate clear_blocks with idct of previous block.

This is identical to what e.g. vp8 does, and prevents the function call
overhead (plus dependency on dsputil for this particular function).

Arm asm updated by Janne Grunau <janne-libav@jannau.net>.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agolavf/id3v2: seek back to previous offset if header size is not matched
Matthieu Bouron [Sat, 19 Jan 2013 12:32:58 +0000 (13:32 +0100)]
lavf/id3v2: seek back to previous offset if header size is not matched

Makes ff_id3v2_read reset stream position at the end of ID3 data if the
header size is not matched (caused by an EOF for example).

Current behaviour (without the patch):
    filesize = 400
    id3 data size = 399
    file offset after ff_id3v2_read is 400 instead of 399

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg1enc: Disable threads for resolutions too large for multi-threading
Michael Niedermayer [Sun, 20 Jan 2013 03:14:09 +0000 (04:14 +0100)]
mpeg1enc: Disable threads for resolutions too large for multi-threading

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: check that dither array is not null before memset
Michael Niedermayer [Sat, 19 Jan 2013 21:46:34 +0000 (22:46 +0100)]
sws: check that dither array is not null before memset

Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: Check for unsupported combination of ED/FULL_CHR flags
Michael Niedermayer [Sat, 19 Jan 2013 20:43:54 +0000 (21:43 +0100)]
sws: Check for unsupported combination of ED/FULL_CHR flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: Fix error diffusion flag
Michael Niedermayer [Sat, 19 Jan 2013 22:11:26 +0000 (23:11 +0100)]
sws: Fix error diffusion flag

The used flag was mistakenly overlapping with chroma drop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegvideo: fix loop condition in draw_line()
Xi Wang [Sat, 19 Jan 2013 18:21:35 +0000 (13:21 -0500)]
mpegvideo: fix loop condition in draw_line()

The loop condition `x = ex' is incorrect.  It should be `x <= ex'.

This bug was introduced in commit c65dfac4 "mpegvideo.c: K&R formatting
and cosmetics."

CC:libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoffmpeg: accept "chapters" as forced key frames.
Nicolas George [Wed, 2 Jan 2013 18:08:08 +0000 (19:08 +0100)]
ffmpeg: accept "chapters" as forced key frames.

Allow to force a key frame at the beginning of each chapter.

7 years agodvdsubdec: parse the size from the extradata
Clément Bœsch [Wed, 16 Jan 2013 17:42:16 +0000 (18:42 +0100)]
dvdsubdec: parse the size from the extradata

Signed-off-by: Alexandra Khirnova <alexandra.khirnova@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agocmdline: fix -- to escape files starting with -
Michael Niedermayer [Thu, 17 Jan 2013 16:03:07 +0000 (17:03 +0100)]
cmdline: fix -- to escape files starting with -

Fixes Ticket2127

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/id3v2: cosmetics: reindent
Matthieu Bouron [Sat, 19 Jan 2013 12:38:26 +0000 (13:38 +0100)]
lavf/id3v2: cosmetics: reindent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: Fix Barcelona and Bulldozer compiler options with suncc
James Almer [Sat, 19 Jan 2013 04:02:19 +0000 (01:02 -0300)]
configure: Fix Barcelona and Bulldozer compiler options with suncc

Barcelona/amdfam10 does not support SSE4 instructions.
Also, Bulldozer supports AVX instructions, so use them instead.

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/Makefile: Fix make docclean
James Almer [Sat, 19 Jan 2013 03:48:59 +0000 (00:48 -0300)]
doc/Makefile: Fix make docclean

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 19 Jan 2013 12:18:10 +0000 (13:18 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Drop some unused macro definitions
  x86: Add a Yasm-based emms() replacement

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'd633d12b2cc999cee3ac25bf9a810fe7ff03726d'
Michael Niedermayer [Sat, 19 Jan 2013 12:11:34 +0000 (13:11 +0100)]
Merge commit 'd633d12b2cc999cee3ac25bf9a810fe7ff03726d'

* commit 'd633d12b2cc999cee3ac25bf9a810fe7ff03726d':
  x86inc: Add cvisible macro for C functions with public prefix

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b'
Michael Niedermayer [Sat, 19 Jan 2013 12:01:06 +0000 (13:01 +0100)]
Merge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b'

* commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b':
  x86inc: Rename "program_name" to "private_prefix"
  configure: Run SHFLAGS through ldflags_filter()

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAPIchanges: Add git version and fix version for avfilter_ref_get_channels().
Carl Eugen Hoyos [Sat, 19 Jan 2013 09:45:34 +0000 (10:45 +0100)]
APIchanges: Add git version and fix version for avfilter_ref_get_channels().

7 years agoAdd APIchanges entry for av_codec_get_tag2().
Carl Eugen Hoyos [Sat, 19 Jan 2013 09:42:27 +0000 (10:42 +0100)]
Add APIchanges entry for av_codec_get_tag2().

7 years agoh264: unmark frames at the end
Michael Niedermayer [Sat, 19 Jan 2013 05:18:24 +0000 (06:18 +0100)]
h264: unmark frames at the end

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: fix ED mono dither black level
Michael Niedermayer [Sat, 19 Jan 2013 03:21:44 +0000 (04:21 +0100)]
sws: fix ED mono dither black level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 19 Jan 2013 02:56:00 +0000 (03:56 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: flush video filters on seek
  ffplay: use videoq.serial to detect obsolete frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: EBU R.128 irregular time
sedacca@comcast.net [Fri, 18 Jan 2013 05:13:10 +0000 (05:13 +0000)]
lavfi: EBU R.128 irregular time

Correct the time interval between logged data rows to the expected
value of 100 milliseconds by naming a new loop counter variable
to be distinct from loop counters for inner loops that
inadvertently change the outer loop operation.

This suggested patch is 1 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".
This suggested patch supersedes the contribution of January 15, 2013
in the thread “[PATCH] lavfi: EBU R.128 irreg time, ch weights, skip
LFE” which combined multiple fixes in one patch.

Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: Enable full chroma resolution when needed for ED dither
Michael Niedermayer [Sat, 19 Jan 2013 00:48:47 +0000 (01:48 +0100)]
sws: Enable full chroma resolution when needed for ED dither

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: Only reset dither state for bitexact mode
Michael Niedermayer [Sat, 19 Jan 2013 00:40:10 +0000 (01:40 +0100)]
sws: Only reset dither state for bitexact mode

the output looks better with a random initial state than
all 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: rgb/bgr 4/8 error diffusion dither
Michael Niedermayer [Sat, 19 Jan 2013 00:39:42 +0000 (01:39 +0100)]
sws: rgb/bgr 4/8 error diffusion dither

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: add AVOption flag for error diffusion dither
Michael Niedermayer [Sat, 19 Jan 2013 00:38:54 +0000 (01:38 +0100)]
sws: add AVOption flag for error diffusion dither

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/muxers: apply minor cosmetics to segment option descriptions
Stefano Sabatini [Fri, 18 Jan 2013 23:44:31 +0000 (00:44 +0100)]
doc/muxers: apply minor cosmetics to segment option descriptions

7 years agoffplay: flush video filters on seek
Marton Balint [Thu, 27 Dec 2012 00:59:12 +0000 (01:59 +0100)]
ffplay: flush video filters on seek

Actually we just re-create the filters, since there is no way to flush them.
Fixes hangup with yadif filter on seeking forward caused by a filtered frame
with a pts before the seek.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: use videoq.serial to detect obsolete frames
Marton Balint [Wed, 2 Jan 2013 00:00:12 +0000 (01:00 +0100)]
ffplay: use videoq.serial to detect obsolete frames

Previously VideoPicture->skip was used for that, using videoq.serial enables us
to detect obsolete frames right after pushing flush_pkt to the packet queue, so
we don't have to wait for the decoder thread to pop the flush packet anymore.

This is good because until now a full video picture queue may have blocked the
decoder thread.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agolavf/segment: do not auto-select a video stream with attached_pic disposition
Stefano Sabatini [Wed, 16 Jan 2013 19:10:12 +0000 (20:10 +0100)]
lavf/segment: do not auto-select a video stream with attached_pic disposition

In particular, fix trac ticket #2138.

7 years agolavf/segment: move reference stream selection code to a dedicated function
Stefano Sabatini [Wed, 16 Jan 2013 18:52:58 +0000 (19:52 +0100)]
lavf/segment: move reference stream selection code to a dedicated function

7 years agolavf/segment: remove now unused field list_max_segment_time
Stefano Sabatini [Fri, 21 Dec 2012 01:39:53 +0000 (02:39 +0100)]
lavf/segment: remove now unused field list_max_segment_time

7 years agolavf/segment: add support to segment list file entries sliding window listing
Stefano Sabatini [Thu, 20 Dec 2012 13:20:19 +0000 (14:20 +0100)]
lavf/segment: add support to segment list file entries sliding window listing

In particular, should fix trac ticket #1842.

7 years agolavf/segment: add SegmentListEntry and use it
Stefano Sabatini [Mon, 10 Dec 2012 23:14:22 +0000 (00:14 +0100)]
lavf/segment: add SegmentListEntry and use it

This patch is propedeutic to the incoming patch which adds
support to sliding window segment listing.

7 years agolavf/utils: provide feedback in case of invalid probe size
Stefano Sabatini [Wed, 16 Jan 2013 11:53:01 +0000 (12:53 +0100)]
lavf/utils: provide feedback in case of invalid probe size

Log message in case the max_probe_size value in av_probe_input_buffer()
is smaller than the minimum accepted value.

7 years agovf_fade: use AVPixFmtDescriptor to find out if pixel format have alpha
Paul B Mahol [Fri, 18 Jan 2013 15:08:50 +0000 (15:08 +0000)]
vf_fade: use AVPixFmtDescriptor to find out if pixel format have alpha

Remove alpha_pix_fmts[].

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosws: Support error diffusion dither for mono output
Michael Niedermayer [Fri, 18 Jan 2013 22:01:08 +0000 (23:01 +0100)]
sws: Support error diffusion dither for mono output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: create a dedicated "Examples" subsection for fade, and use @itemize
Stefano Sabatini [Fri, 18 Jan 2013 18:00:35 +0000 (19:00 +0100)]
doc/filters: create a dedicated "Examples" subsection for fade, and use @itemize

7 years agolavfi/fade: accept shorthand syntax
Stefano Sabatini [Fri, 18 Jan 2013 17:56:29 +0000 (18:56 +0100)]
lavfi/fade: accept shorthand syntax

7 years agox86: dsputil: Drop some unused macro definitions
Diego Biurrun [Wed, 16 Jan 2013 22:50:57 +0000 (23:50 +0100)]
x86: dsputil: Drop some unused macro definitions

7 years agox86: Add a Yasm-based emms() replacement
Martin Storsjö [Wed, 9 Jan 2013 20:57:41 +0000 (22:57 +0200)]
x86: Add a Yasm-based emms() replacement

This provides a fallback when building with Yasm enabled, but neither
inline assembly, nor the _mm_empty intrinsic are available or enabled.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agox86inc: Add cvisible macro for C functions with public prefix
Diego Biurrun [Wed, 9 Jan 2013 22:17:08 +0000 (23:17 +0100)]
x86inc: Add cvisible macro for C functions with public prefix

This allows defining externally visible library symbols.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agox86inc: Rename "program_name" to "private_prefix"
Diego Biurrun [Wed, 9 Jan 2013 22:15:14 +0000 (23:15 +0100)]
x86inc: Rename "program_name" to "private_prefix"

The new name is more descriptive and will allow defining a separate
public prefix for externally visible library symbols.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoconfigure: Run SHFLAGS through ldflags_filter()
Sean McGovern [Mon, 14 Jan 2013 17:52:00 +0000 (12:52 -0500)]
configure: Run SHFLAGS through ldflags_filter()

These flags are as linker-specific as other LDFLAGS and thus
need to be translated to the correct linker syntax.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agodoc/filters: avoid @example for showing the drawbox shorthand syntax
Stefano Sabatini [Fri, 18 Jan 2013 17:36:35 +0000 (18:36 +0100)]
doc/filters: avoid @example for showing the drawbox shorthand syntax

Improve overall consistency.

7 years agogolomb: check log validity before shifting
Michael Niedermayer [Sat, 12 Jan 2013 21:14:25 +0000 (22:14 +0100)]
golomb: check log validity before shifting

Fixes invalid right shift in fate-cavs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_fade: support YUVA422P & YUVA444P
Paul B Mahol [Fri, 18 Jan 2013 10:41:09 +0000 (10:41 +0000)]
vf_fade: support YUVA422P & YUVA444P

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoh264/get_lowest_part_list_y: remove unneeded operations
Michael Niedermayer [Wed, 16 Jan 2013 00:26:44 +0000 (01:26 +0100)]
h264/get_lowest_part_list_y: remove unneeded operations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 18 Jan 2013 12:54:38 +0000 (13:54 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: avoid pointless copying of ref lists
  lavr: always reset mix function names and pointers in mix_function_init()
  lavr: call mix_function_init() in ff_audio_mix_set_matrix()
  fate: update ref after rv30_loop_filter fix
  rv30: fix masking in rv30_loop_filter()

Conflicts:
tests/ref/fate/filter-delogo
tests/ref/fate/rv30

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'
Michael Niedermayer [Fri, 18 Jan 2013 12:36:39 +0000 (13:36 +0100)]
Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'

* commit '80ac87c13dc8c6c063e26a464c5c542357c0583f':
  lavc: support ZenoXVID custom tag
  libcdio: support recent cdio-paranoia
  float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
  theora: Skip zero-sized headers

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix opencv detection.
Jonas Bechtel [Sun, 13 Jan 2013 20:45:15 +0000 (21:45 +0100)]
Fix opencv detection.

This commit changes the ".so" argument placement in check_ld sub-program.

7 years agoh264: avoid pointless copying of ref lists
Anton Khirnov [Thu, 17 Jan 2013 11:25:31 +0000 (12:25 +0100)]
h264: avoid pointless copying of ref lists

ref_list is constructed from other fields per slice when needed, so do
not copy it for both frame and slice threading.
default_ref_list is constructed per frame and still needs to be copied
to per-slice contexts for slice threading, but a copy is not needed for
frame threading.

7 years agoavcodec_decode_audio: do not trust the channel layout, use the channel count.
Michael Niedermayer [Fri, 18 Jan 2013 00:28:44 +0000 (01:28 +0100)]
avcodec_decode_audio: do not trust the channel layout, use the channel count.

Fixes memory corruption

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavr: always reset mix function names and pointers in mix_function_init()
Justin Ruggles [Wed, 16 Jan 2013 19:18:38 +0000 (14:18 -0500)]
lavr: always reset mix function names and pointers in mix_function_init()

CC: libav-stable@libav.org
7 years agolavr: call mix_function_init() in ff_audio_mix_set_matrix()
Justin Ruggles [Wed, 16 Jan 2013 19:15:57 +0000 (14:15 -0500)]
lavr: call mix_function_init() in ff_audio_mix_set_matrix()

This is needed if a custom matrix is set by the user after opening the
AVAudioResampleContext because the matrix channel count can change if
different mixing coefficients are used.

CC:libav-stable@libav.org

7 years agomlpdec: dont leave a invalid huff_lsb in the context.
Michael Niedermayer [Thu, 17 Jan 2013 23:22:39 +0000 (00:22 +0100)]
mlpdec: dont leave a invalid huff_lsb in the context.

Fix assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegvideo: reset context state on failed thread update.
Michael Niedermayer [Thu, 17 Jan 2013 21:45:12 +0000 (22:45 +0100)]
mpegvideo: reset context state on failed thread update.

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: update ref after rv30_loop_filter fix
Luca Barbato [Thu, 17 Jan 2013 22:06:46 +0000 (23:06 +0100)]
fate: update ref after rv30_loop_filter fix

7 years agorv30: fix masking in rv30_loop_filter()
Xi Wang [Thu, 17 Jan 2013 06:24:15 +0000 (01:24 -0500)]
rv30: fix masking in rv30_loop_filter()

The mask `x && (1 << y)' is incorrect and always yields true.

The correct form should be `x & (1 << y)'.

CC: libav-stable@libav.org
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agolavc: support ZenoXVID custom tag
Luca Barbato [Thu, 17 Jan 2013 13:12:44 +0000 (14:12 +0100)]
lavc: support ZenoXVID custom tag

Looks like this kind of samples are produced by certain Russian
equipment.

7 years agolibcdio: support recent cdio-paranoia
Luca Barbato [Thu, 17 Jan 2013 10:24:01 +0000 (11:24 +0100)]
libcdio: support recent cdio-paranoia

Upstream decided to split the paranoia interface and move the headers
accordingly.

7 years agoUse new function av_codec_get_tag2() in ffmpeg.c.
Carl Eugen Hoyos [Thu, 17 Jan 2013 19:46:21 +0000 (20:46 +0100)]
Use new function av_codec_get_tag2() in ffmpeg.c.

Fixes ticket #1953.

7 years agoAdd a new function av_codec_get_tag2().
Carl Eugen Hoyos [Thu, 17 Jan 2013 19:44:33 +0000 (20:44 +0100)]
Add a new function av_codec_get_tag2().

av_codec_get_tag() may return 0 both in case a codec_tag was
found and if no codec_tag was found.
The new function does not have this ambiguity.

7 years ago.gitignore: add /doc/examples/pc-uninstalled
Paul B Mahol [Wed, 16 Jan 2013 20:08:20 +0000 (20:08 +0000)]
.gitignore: add /doc/examples/pc-uninstalled

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofloat_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
Martin Storsjö [Thu, 17 Jan 2013 16:58:25 +0000 (18:58 +0200)]
float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window

This fixes builds on 64bit MSVC.

Signed-off-by: Martin Storsjö <martin@martin.st>