ffmpeg.git
7 years agolavfi/cropdetect: use standard options parsing.
Clément Bœsch [Sun, 24 Mar 2013 07:57:56 +0000 (08:57 +0100)]
lavfi/cropdetect: use standard options parsing.

7 years agolavfi/boxblur: use standard options parsing.
Clément Bœsch [Sun, 24 Mar 2013 07:56:02 +0000 (08:56 +0100)]
lavfi/boxblur: use standard options parsing.

7 years agolavfi/blackframe: use standard options parsing.
Clément Bœsch [Sun, 24 Mar 2013 07:53:38 +0000 (08:53 +0100)]
lavfi/blackframe: use standard options parsing.

7 years agolavfi/settb: use standard options parsing.
Clément Bœsch [Sun, 24 Mar 2013 07:50:52 +0000 (08:50 +0100)]
lavfi/settb: use standard options parsing.

7 years agolavfi/select: use standard options parsing.
Clément Bœsch [Sun, 24 Mar 2013 07:45:32 +0000 (08:45 +0100)]
lavfi/select: use standard options parsing.

7 years agolavfi/perms: use standard options parsing.
Clément Bœsch [Sun, 24 Mar 2013 07:42:10 +0000 (08:42 +0100)]
lavfi/perms: use standard options parsing.

7 years agolavfi/sine: use standard options parsing.
Clément Bœsch [Sun, 24 Mar 2013 07:40:38 +0000 (08:40 +0100)]
lavfi/sine: use standard options parsing.

7 years agolavfi/apad: use standard options parsing.
Clément Bœsch [Sun, 24 Mar 2013 07:39:00 +0000 (08:39 +0100)]
lavfi/apad: use standard options parsing.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 24 Mar 2013 10:51:46 +0000 (11:51 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: Change a missed occurrance of int to ptrdiff_t for strides
  x86: Remove win64 xmm clobbering wrappers for the now removed avcodec_encode_video function
  bktr: Add missing includes for av_gettime()
  fate: use little endian yuv444p10 in h264-reinit tests

Nothing changes through this merge as the 3 bugfixes already exist
in ffmpeg and the clobbering wraper is still in use as we did not
yet remove avcodec_encode_video

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: Change a missed occurrance of int to ptrdiff_t for strides
Martin Storsjö [Sat, 23 Mar 2013 21:35:19 +0000 (23:35 +0200)]
x86: Change a missed occurrance of int to ptrdiff_t for strides

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sun, 24 Mar 2013 03:35:40 +0000 (04:35 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: avoid frame data leak on early frame drop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorawdec: fix memleak
Michael Niedermayer [Sun, 24 Mar 2013 03:09:04 +0000 (04:09 +0100)]
rawdec: fix memleak

Fixes fate-lavf-flm under valgrind

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/buffer: remove redundant memory poisoning
Michael Niedermayer [Sun, 24 Mar 2013 01:21:42 +0000 (02:21 +0100)]
avutil/buffer: remove redundant memory poisoning

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/buffer: support memory poisoning
Michael Niedermayer [Sun, 24 Mar 2013 00:44:48 +0000 (01:44 +0100)]
avutil/buffer: support memory poisoning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyop: use reget_buffer() as the previous contents are used
Michael Niedermayer [Sun, 24 Mar 2013 00:41:49 +0000 (01:41 +0100)]
yop: use reget_buffer() as the previous contents are used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: dont try to filter partial frames with yadif.
Michael Niedermayer [Sun, 24 Mar 2013 00:30:11 +0000 (01:30 +0100)]
fate: dont try to filter partial frames with yadif.

The partial frames leak a few uninitialized pixels through
due to incomplete interlaced error concealment support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuffersink/uninit: use av_frame_free() not unref
Michael Niedermayer [Sat, 23 Mar 2013 22:49:33 +0000 (23:49 +0100)]
buffersink/uninit: use av_frame_free() not unref

Fixes memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: Remove win64 xmm clobbering wrappers for the now removed avcodec_encode_video...
Martin Storsjö [Sat, 23 Mar 2013 20:12:54 +0000 (22:12 +0200)]
x86: Remove win64 xmm clobbering wrappers for the now removed avcodec_encode_video function

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agobktr: Add missing includes for av_gettime()
Martin Storsjö [Sat, 23 Mar 2013 20:16:37 +0000 (22:16 +0200)]
bktr: Add missing includes for av_gettime()

This is necessary after the old av_gettime in libavformat was
dropped.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agofate: use little endian yuv444p10 in h264-reinit tests
Janne Grunau [Sat, 23 Mar 2013 12:15:17 +0000 (13:15 +0100)]
fate: use little endian yuv444p10 in h264-reinit tests

Fixes fate big endian configs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: dont report rows as finished after a missing slice
Michael Niedermayer [Tue, 19 Feb 2013 19:48:02 +0000 (20:48 +0100)]
h264: dont report rows as finished after a missing slice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/anullsrc: add missing checks
Stefano Sabatini [Fri, 22 Mar 2013 00:43:43 +0000 (01:43 +0100)]
lavfi/anullsrc: add missing checks

7 years agolavfi/anullsrc: remove extra parentheses
Stefano Sabatini [Fri, 22 Mar 2013 00:42:12 +0000 (01:42 +0100)]
lavfi/anullsrc: remove extra parentheses

7 years agolavfi/anullsrc: simplify logging code in config_props
Stefano Sabatini [Fri, 22 Mar 2013 00:39:48 +0000 (01:39 +0100)]
lavfi/anullsrc: simplify logging code in config_props

7 years agolavfi/anullsrc: fix format negotiation
Stefano Sabatini [Fri, 22 Mar 2013 00:35:13 +0000 (01:35 +0100)]
lavfi/anullsrc: fix format negotiation

Samplerate and channel layouts must be set in query_formats.

7 years agomips: Optimization of AAC psychoacoustic model functions
Bojan Zivkovic [Wed, 6 Mar 2013 13:55:04 +0000 (14:55 +0100)]
mips: Optimization of AAC psychoacoustic model functions

Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibspeex: support ZygoAudio (quality 10 mode)
Piotr Bandurski [Wed, 16 Jan 2013 18:32:54 +0000 (19:32 +0100)]
libspeex: support ZygoAudio (quality 10 mode)

Fixes "quality 10" mode from Ticket1873

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavd/v4l2: honor previously selected input channel
Giorgio Vazzana [Tue, 19 Mar 2013 18:09:38 +0000 (19:09 +0100)]
lavd/v4l2: honor previously selected input channel

An input channel could have been previously set with another application, like
v4l2-ctl, so if no input channel is specified use the previosly selected one.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMake audio FIFO read/write contracts more strict
Michael Bradshaw [Sat, 9 Mar 2013 05:48:43 +0000 (22:48 -0700)]
Make audio FIFO read/write contracts more strict

Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: use little endian yuv444p10 in h264-reinit tests
Janne Grunau [Sat, 23 Mar 2013 12:12:36 +0000 (13:12 +0100)]
fate: use little endian yuv444p10 in h264-reinit tests

Fixes fate big endian configs.

7 years agoCall do_video_stats when duplicating frame
Thierry Foucu [Sat, 23 Mar 2013 05:47:30 +0000 (22:47 -0700)]
Call do_video_stats when duplicating frame

When multiple frame are encoded during vsync, current code only
do_video_stats once. This need to do it every frame.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 23 Mar 2013 11:24:05 +0000 (12:24 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add test for cropping h264 to container dimensions
  FATE: add a tscc2 test.
  tscc2: allocate AVFrame properly.

Conflicts:
libavcodec/tscc2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '20a8ee3061e6d777600c13db731bee3c25878991'
Michael Niedermayer [Sat, 23 Mar 2013 11:16:29 +0000 (12:16 +0100)]
Merge commit '20a8ee3061e6d777600c13db731bee3c25878991'

* commit '20a8ee3061e6d777600c13db731bee3c25878991':
  af_asyncts: fix compensation and PTS monotonicity

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6'
Michael Niedermayer [Sat, 23 Mar 2013 11:07:06 +0000 (12:07 +0100)]
Merge commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6'

* commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6':
  avutil/frame: add all remaining frame properties to av_frame_copy_props

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: Correct inter stream timestamp discontinuities
Michael Niedermayer [Sat, 23 Mar 2013 03:30:19 +0000 (04:30 +0100)]
ffmpeg: Correct inter stream timestamp discontinuities

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: avoid frame data leak on early frame drop
Marton Balint [Sat, 23 Mar 2013 01:25:33 +0000 (02:25 +0100)]
ffplay: avoid frame data leak on early frame drop

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoChangelog: add WebP
Michael Niedermayer [Fri, 22 Mar 2013 22:18:26 +0000 (23:18 +0100)]
Changelog: add WebP

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/blend: always peek the first frame of each queue.
Clément Bœsch [Fri, 22 Mar 2013 08:54:06 +0000 (09:54 +0100)]
lavfi/blend: always peek the first frame of each queue.

Before the change, filter_frame() always waited for 2 samples in the
bottom frames queue. This notably fixes commands such as
./ffplay tests/lena.pnm -vf split,blend=c0_mode=addition

7 years agolavc/prores: restore pict_type and key_frame setting.
Clément Bœsch [Fri, 22 Mar 2013 18:56:39 +0000 (19:56 +0100)]
lavc/prores: restore pict_type and key_frame setting.

7 years agox86/mpegvideo: switch to av_assert
Michael Niedermayer [Fri, 22 Mar 2013 21:57:23 +0000 (22:57 +0100)]
x86/mpegvideo: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86/h264_qpel: switch to av_assert
Michael Niedermayer [Fri, 22 Mar 2013 21:57:08 +0000 (22:57 +0100)]
x86/h264_qpel: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add test for cropping h264 to container dimensions
Janne Grunau [Wed, 20 Mar 2013 16:44:43 +0000 (17:44 +0100)]
fate: add test for cropping h264 to container dimensions

Tests the workaround added for 1080 videos created with Canon cameras
in 30f515091c323da59c0f1b533703dedca2f4b95d.

7 years agoFix typo in dvvideo decoder dependencies.
Carl Eugen Hoyos [Fri, 22 Mar 2013 20:37:17 +0000 (21:37 +0100)]
Fix typo in dvvideo decoder dependencies.

Fixes compilation with --disable-everything --enable-decoder=dvvideo

7 years agoFATE: add a tscc2 test.
Anton Khirnov [Mon, 18 Mar 2013 14:59:05 +0000 (15:59 +0100)]
FATE: add a tscc2 test.

7 years agotscc2: allocate AVFrame properly.
Anton Khirnov [Mon, 18 Mar 2013 14:53:51 +0000 (15:53 +0100)]
tscc2: allocate AVFrame properly.

7 years agoaf_asyncts: fix compensation and PTS monotonicity
Jindřich Makovička [Sat, 9 Mar 2013 09:08:09 +0000 (10:08 +0100)]
af_asyncts: fix compensation and PTS monotonicity

This patch improves af_asyncts behavior on streams with bogus PTS, which
are either non-monotonic, or contain PTS jitter, and trigger the
non-monotonicity error. With this patch, af_asyncts is able to correct
these streams and avoid the error.

Firstly, it fixes resample compensation calculation by supplying proper
units to avresample_set_compensation (sample count per second instead
of sample count per some arbitrary frame size). Also, the calculation of
the compensation itself is fixed - delta is proportional to an adjustment
of the compensation, not the compensation itself. Ideally, the compensation
should converge to a value that keeps delta at zero.

To be able to deal with sources with PTS jitter even without resampling,
small PTS errors are adjusted, so the output frames do not overlap.

Finally, one more monotonicity check is added.

The FATE reference changes because now there is 8 less samples of
silence because of the pts jitter.

Signed-off-by: Jindřich Makovička <makovick@gmail.com>
7 years agoavutil/frame: add all remaining frame properties to av_frame_copy_props
Hendrik Leppkes [Fri, 22 Mar 2013 14:13:42 +0000 (15:13 +0100)]
avutil/frame: add all remaining frame properties to av_frame_copy_props

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoh263dec: switch to av_assert()
Michael Niedermayer [Fri, 22 Mar 2013 17:07:26 +0000 (18:07 +0100)]
h263dec: switch to av_assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomatroskadec: switch to av_assert
Michael Niedermayer [Fri, 22 Mar 2013 17:04:17 +0000 (18:04 +0100)]
matroskadec: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovp8: WebP decoding support
Michael Niedermayer [Fri, 22 Mar 2013 10:38:46 +0000 (11:38 +0100)]
vp8: WebP decoding support

VP8L, padding and bounds checks by Pascal Massimino

Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimg2: WebP support
Michael Niedermayer [Fri, 22 Mar 2013 02:42:35 +0000 (03:42 +0100)]
img2: WebP support

Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix compilation with --disable-everything --enable-parser=h264.
Carl Eugen Hoyos [Fri, 22 Mar 2013 12:32:35 +0000 (13:32 +0100)]
Fix compilation with --disable-everything --enable-parser=h264.

7 years agoFix compilation with --disable-mmx.
Carl Eugen Hoyos [Fri, 22 Mar 2013 11:00:26 +0000 (12:00 +0100)]
Fix compilation with --disable-mmx.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 22 Mar 2013 11:52:05 +0000 (12:52 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Enable hwaccels without external dependencies by default.
  doc/developer: Clarify symbol naming prefixes section.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/eval: add between() function.
Clément Bœsch [Fri, 22 Mar 2013 00:47:49 +0000 (01:47 +0100)]
lavu/eval: add between() function.

7 years agoDo not fail in get_buffer_internal() if pix_fmt planes == 0.
Carl Eugen Hoyos [Fri, 22 Mar 2013 00:03:07 +0000 (01:03 +0100)]
Do not fail in get_buffer_internal() if pix_fmt planes == 0.

Fixes VDPAU decoding, reported by Ilja Sekler

7 years agoerror_resilience: fix const correctness, silence warnings
Michael Niedermayer [Thu, 21 Mar 2013 22:32:37 +0000 (23:32 +0100)]
error_resilience: fix const correctness, silence warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovdpau.h: change vdpau_render_state layout to match fork if AV_HAVE_INCOMPATIBLE_FORK_ABI
Michael Niedermayer [Wed, 20 Mar 2013 22:25:45 +0000 (23:25 +0100)]
vdpau.h: change vdpau_render_state layout to match fork if AV_HAVE_INCOMPATIBLE_FORK_ABI

This might fix a compatibility issue.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovda_h264: fix for VDA compile
Andrew Euell [Thu, 21 Mar 2013 18:16:44 +0000 (14:16 -0400)]
vda_h264: fix for VDA compile

the VDA code needs to be updated to use the CHROMA(h) macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosonicdec: update to new buffer API
Michael Niedermayer [Thu, 21 Mar 2013 15:00:35 +0000 (16:00 +0100)]
sonicdec: update to new buffer API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosonicenc: fix mono decorrelation
Michael Niedermayer [Thu, 21 Mar 2013 14:49:22 +0000 (15:49 +0100)]
sonicenc: fix mono decorrelation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosonicdec: fix frame size
Michael Niedermayer [Thu, 21 Mar 2013 14:46:16 +0000 (15:46 +0100)]
sonicdec: fix frame size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosonicdec: check decorrelation
Michael Niedermayer [Thu, 21 Mar 2013 14:45:59 +0000 (15:45 +0100)]
sonicdec: check decorrelation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agog729dec: switch to buffer refs style
Michael Niedermayer [Thu, 21 Mar 2013 13:48:16 +0000 (14:48 +0100)]
g729dec: switch to buffer refs style

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agov308dec: remove unneeded self assignment
Michael Niedermayer [Thu, 21 Mar 2013 13:43:09 +0000 (14:43 +0100)]
v308dec: remove unneeded self assignment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: Enable hwaccels without external dependencies by default.
Diego Biurrun [Mon, 18 Mar 2013 21:27:03 +0000 (22:27 +0100)]
configure: Enable hwaccels without external dependencies by default.

7 years agodoc/developer: Clarify symbol naming prefixes section.
Diego Biurrun [Sat, 16 Mar 2013 23:57:12 +0000 (00:57 +0100)]
doc/developer: Clarify symbol naming prefixes section.

7 years agoffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with yadif...
Michael Niedermayer [Thu, 21 Mar 2013 12:54:04 +0000 (13:54 +0100)]
ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with yadif injection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: remove unused variable
Michael Niedermayer [Thu, 21 Mar 2013 12:17:55 +0000 (13:17 +0100)]
h264: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: add an argument to CHROMA for consistency
Michael Niedermayer [Thu, 21 Mar 2013 12:17:19 +0000 (13:17 +0100)]
h264: add an argument to CHROMA for consistency

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 21 Mar 2013 12:10:50 +0000 (13:10 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: remove redundant freeing of DPB in h264_decode_end

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '23e85be58fc64b2e804e68b0034a08a6d257e523'
Michael Niedermayer [Thu, 21 Mar 2013 12:06:14 +0000 (13:06 +0100)]
Merge commit '23e85be58fc64b2e804e68b0034a08a6d257e523'

* commit '23e85be58fc64b2e804e68b0034a08a6d257e523':
  h264: add a parameter to the CHROMA444 macro.
  h264: add a parameter to the CHROMA422 macro.

Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6d2b6f21eb45ffbda1103c772060303648714832'
Michael Niedermayer [Thu, 21 Mar 2013 11:58:00 +0000 (12:58 +0100)]
Merge commit '6d2b6f21eb45ffbda1103c772060303648714832'

* commit '6d2b6f21eb45ffbda1103c772060303648714832':
  h264: add a parameter to the CABAC macro.
  h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro.

Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4'
Michael Niedermayer [Thu, 21 Mar 2013 11:50:18 +0000 (12:50 +0100)]
Merge commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4'

* commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4':
  h264: add a parameter to the FIELD_PICTURE macro.
  h264: add a parameter to the FRAME_MBAFF macro.

Conflicts:
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7'
Michael Niedermayer [Thu, 21 Mar 2013 11:43:32 +0000 (12:43 +0100)]
Merge commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7'

* commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7':
  h264: add a parameter to the MB_FIELD macro.
  h264: add a parameter to the MB_MBAFF macro.

Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67'
Michael Niedermayer [Thu, 21 Mar 2013 11:34:59 +0000 (12:34 +0100)]
Merge commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67'

* commit '48d0fd2d62a476e1db9298163f1fc0abae26cc67':
  h264: merge common_init() into ff_h264_decode_init.

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e'
Michael Niedermayer [Thu, 21 Mar 2013 11:05:13 +0000 (12:05 +0100)]
Merge commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e'

* commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e':
  h264: make ff_h264_frame_start static.

Conflicts:
libavcodec/h264.c
libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5'
Michael Niedermayer [Thu, 21 Mar 2013 10:56:15 +0000 (11:56 +0100)]
Merge commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5'

* commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5':
  fate: add tests for h264 decoder reinit
  h264: fix bit depth changes with frame threading

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: drop special case for 9bit chroma422
Michael Niedermayer [Thu, 21 Mar 2013 10:51:26 +0000 (11:51 +0100)]
h264: drop special case for 9bit chroma422

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: remove redundant freeing of DPB in h264_decode_end
Anton Khirnov [Tue, 12 Mar 2013 11:33:19 +0000 (12:33 +0100)]
h264: remove redundant freeing of DPB in h264_decode_end

free_tables() frees it already.

7 years agoh264: add a parameter to the CHROMA444 macro.
Anton Khirnov [Sat, 9 Mar 2013 19:37:11 +0000 (20:37 +0100)]
h264: add a parameter to the CHROMA444 macro.

This way it does not look like a constant.

7 years agoh264: add a parameter to the CHROMA422 macro.
Anton Khirnov [Sat, 9 Mar 2013 19:37:11 +0000 (20:37 +0100)]
h264: add a parameter to the CHROMA422 macro.

This way it does not look like a constant.

7 years agoh264: add a parameter to the CABAC macro.
Anton Khirnov [Sat, 9 Mar 2013 19:37:11 +0000 (20:37 +0100)]
h264: add a parameter to the CABAC macro.

This way it does not look like a constant.

7 years agoh264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro.
Anton Khirnov [Sat, 9 Mar 2013 19:37:11 +0000 (20:37 +0100)]
h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro.

This way it does not look like a constant.

7 years agoh264: add a parameter to the FIELD_PICTURE macro.
Anton Khirnov [Sat, 9 Mar 2013 19:37:11 +0000 (20:37 +0100)]
h264: add a parameter to the FIELD_PICTURE macro.

This way it does not look like a constant.

7 years agoh264: add a parameter to the FRAME_MBAFF macro.
Anton Khirnov [Sat, 9 Mar 2013 19:37:11 +0000 (20:37 +0100)]
h264: add a parameter to the FRAME_MBAFF macro.

This way it does not look like a constant.

7 years agoh264: add a parameter to the MB_FIELD macro.
Anton Khirnov [Sat, 9 Mar 2013 19:37:11 +0000 (20:37 +0100)]
h264: add a parameter to the MB_FIELD macro.

This way it does not look like a constant.

7 years agoh264: add a parameter to the MB_MBAFF macro.
Anton Khirnov [Sat, 9 Mar 2013 19:37:11 +0000 (20:37 +0100)]
h264: add a parameter to the MB_MBAFF macro.

This way it does not look like a constant.

7 years agoh264: merge common_init() into ff_h264_decode_init.
Anton Khirnov [Sat, 5 Nov 2011 18:26:54 +0000 (19:26 +0100)]
h264: merge common_init() into ff_h264_decode_init.

There is no point in keeping those separate.

7 years agoh264: make ff_h264_frame_start static.
Anton Khirnov [Sat, 9 Mar 2013 19:21:17 +0000 (20:21 +0100)]
h264: make ff_h264_frame_start static.

It is not called from outside h264.c

7 years agolavfi/vf_stereo3d: use standard options parsing
Paul B Mahol [Thu, 21 Mar 2013 09:17:32 +0000 (09:17 +0000)]
lavfi/vf_stereo3d: use standard options parsing

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoProvide local copies of AviSynth's and AvxSynth's requisite headers in compat/avisynth/.
Stephen Hutchinson [Tue, 26 Feb 2013 23:03:01 +0000 (18:03 -0500)]
Provide local copies of AviSynth's and AvxSynth's requisite headers in compat/avisynth/.

The versions of the headers are the same as those provided with x264
for consistency's sake.

7 years agoAviSynth demuxer rewrite.
d s [Tue, 26 Feb 2013 23:02:20 +0000 (18:02 -0500)]
AviSynth demuxer rewrite.

Dynamically loads the library itself, rather than through VfW.
Supports AvxSynth on Linux and OS X.

Supports the new colorspaces added in AviSynth 2.6 when used
with AviSynth 2.6.

7 years agoavformat/avs: increase probe score to preempt conflict with avxsynth
Michael Niedermayer [Thu, 21 Mar 2013 03:05:02 +0000 (04:05 +0100)]
avformat/avs: increase probe score to preempt conflict with avxsynth

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/utils: fix metadata audio frame memleak in case of non refcounted frames.
Clément Bœsch [Tue, 19 Mar 2013 21:47:49 +0000 (22:47 +0100)]
lavc/utils: fix metadata audio frame memleak in case of non refcounted frames.

The metadata must be set before saving the frame to avci->to_free,
otherwise it will leak.

Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
7 years agoasrc_sine: avoid use of INFINITY as it might be a non constant
Michael Niedermayer [Wed, 20 Mar 2013 23:49:24 +0000 (00:49 +0100)]
asrc_sine: avoid use of INFINITY as it might be a non constant

This should fix compilation on openbsd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Wed, 20 Mar 2013 20:41:22 +0000 (21:41 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/vf_yadif: use standard options parsing.
  lavfi/vf_unsharp: use standard options parsing.
  lavfi/vf_transpose: use standard options parsing.
  lavfi/vf_pad: use standard options parsing.
  lavfi/vf_fps: use standard options parsing.
  lavfi/vf_fade: use standard options parsing.
  lavi/vf_drawbox: use standard options parsing.
  lavfi/vf_delogo: use standard options parsing.
  lavfi/vf_decimate: use standard options parsing.
  lavfi/vf_crop: use standard options parsing.
  lavfi/af_volume: use standard options parsing.
  lavfi/vf_tile: use standard options parsing.
  lavfi/avf_concat: use standard options parsing.
  lavfi: add common code to handle options parsing.
  lavf/vobsub: free index pseudo-packet.
  ffmpeg: fix freeing of sub2video frame.
  lavfi: add sine audio source.
  lavu/opt: add AV_OPT_TYPE_DURATION.
  lavfi/concat: fix silence duration computation.
  lavf/concatdec: support seeking.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomatroskadec: Add support for parsing Matroska ContentEncKeyID
Frank Galligan [Thu, 7 Mar 2013 16:11:38 +0000 (08:11 -0800)]
matroskadec: Add support for parsing Matroska ContentEncKeyID

This patch adds the enums for the ContentEncryption elements.
This patch also adds support for parsing the ContentEncKeyID. The
ContentEncKeyID is then base64 encoded and stored in the stream's
metadata.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/vf_yadif: use standard options parsing.
Nicolas George [Sat, 16 Mar 2013 20:28:02 +0000 (21:28 +0100)]
lavfi/vf_yadif: use standard options parsing.

7 years agolavfi/vf_unsharp: use standard options parsing.
Nicolas George [Sat, 16 Mar 2013 20:27:56 +0000 (21:27 +0100)]
lavfi/vf_unsharp: use standard options parsing.