ffmpeg.git
7 years agoMerge commit '75644335b907919057960716508477239c26fed4'
Michael Niedermayer [Tue, 26 Mar 2013 12:22:48 +0000 (13:22 +0100)]
Merge commit '75644335b907919057960716508477239c26fed4'

* commit '75644335b907919057960716508477239c26fed4':
  lavc: Move start code finding to utils.c

Conflicts:
configure
libavcodec/mpegvideo.c
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f'
Michael Niedermayer [Tue, 26 Mar 2013 12:14:16 +0000 (13:14 +0100)]
Merge commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f'

* commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f':
  ape: 3.80-3.92 decoding support
  h264: Remove an unused variable

Conflicts:
libavcodec/apedec.c
libavformat/ape.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86/dsputil.asm: make unaligned bswap actually work
Michael Niedermayer [Tue, 26 Mar 2013 12:02:37 +0000 (13:02 +0100)]
x86/dsputil.asm: make unaligned bswap actually work

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e5c2794a7162e485eefd3133af5b98fd31386aeb'
Michael Niedermayer [Tue, 26 Mar 2013 11:53:47 +0000 (12:53 +0100)]
Merge commit 'e5c2794a7162e485eefd3133af5b98fd31386aeb'

* commit 'e5c2794a7162e485eefd3133af5b98fd31386aeb':
  x86: consistently use unaligned movs in the unaligned bswap

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: Move start code finding to utils.c
Martin Storsjö [Mon, 25 Mar 2013 10:42:57 +0000 (12:42 +0200)]
lavc: Move start code finding to utils.c

This allows dropping the mpegvideo dependency from a number of
components.

This also fixes standalone building of the h264 parser, which
was broken in 64e438697.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavcodec/x86/dsputil_qns_template: use av_assert
Michael Niedermayer [Tue, 26 Mar 2013 03:04:19 +0000 (04:04 +0100)]
avcodec/x86/dsputil_qns_template: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/perms: add myself to the copyright header.
Clément Bœsch [Tue, 26 Mar 2013 01:41:05 +0000 (02:41 +0100)]
lavfi/perms: add myself to the copyright header.

7 years agolavfi/perms: add seed option.
Clément Bœsch [Tue, 26 Mar 2013 01:39:55 +0000 (02:39 +0100)]
lavfi/perms: add seed option.

7 years agolavfi/perms: remove unecessary indirection after f7324c06.
Clément Bœsch [Tue, 26 Mar 2013 01:24:03 +0000 (02:24 +0100)]
lavfi/perms: remove unecessary indirection after f7324c06.

7 years agoffmpeg_opt: avoid strcpy()
Michael Niedermayer [Tue, 26 Mar 2013 00:50:23 +0000 (01:50 +0100)]
ffmpeg_opt: avoid strcpy()

This fixes a warning on openbsd and is more robust

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotools: add audio normalize script example.
Clément Bœsch [Mon, 18 Mar 2013 03:02:51 +0000 (04:02 +0100)]
tools: add audio normalize script example.

7 years agolavfi/curves: add forgotten strong_contrast preset.
Clément Bœsch [Tue, 26 Mar 2013 00:05:26 +0000 (01:05 +0100)]
lavfi/curves: add forgotten strong_contrast preset.

7 years agolavfi/curves: support preset shorthand.
Clément Bœsch [Mon, 25 Mar 2013 23:00:15 +0000 (00:00 +0100)]
lavfi/curves: support preset shorthand.

7 years agolavfi/curves: add presets support.
Clément Bœsch [Mon, 25 Mar 2013 00:19:17 +0000 (01:19 +0100)]
lavfi/curves: add presets support.

Except for the vintage preset, the values are defined by Lou Logan based
on the ones found in Adobe Photoshop CS6.

Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
7 years agoffserver/ctime1: avoid using strcpy()
Michael Niedermayer [Mon, 25 Mar 2013 22:31:34 +0000 (23:31 +0100)]
ffserver/ctime1: avoid using strcpy()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodshow_pin: dont return a value from a void function
Michael Niedermayer [Mon, 25 Mar 2013 21:12:07 +0000 (22:12 +0100)]
dshow_pin: dont return a value from a void function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibpostproc: silence valgrind/fate warning about using uninitialized data
Michael Niedermayer [Mon, 25 Mar 2013 20:48:45 +0000 (21:48 +0100)]
libpostproc: silence valgrind/fate warning about using uninitialized data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoape: 3.80-3.92 decoding support
Kostya Shishkov [Fri, 15 Mar 2013 20:18:23 +0000 (21:18 +0100)]
ape: 3.80-3.92 decoding support

7 years agoxxan: make code independent of sizeof(AVFrame)
Michael Niedermayer [Sun, 24 Mar 2013 14:14:17 +0000 (15:14 +0100)]
xxan: make code independent of sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyop: Fix return type
Michael Niedermayer [Mon, 25 Mar 2013 14:10:39 +0000 (15:10 +0100)]
yop: Fix return type

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: Remove an unused variable
Martin Storsjö [Mon, 25 Mar 2013 12:27:30 +0000 (14:27 +0200)]
h264: Remove an unused variable

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavcodec/gifdec: Add av_log() to workaround gcc 4.2 miscompiling the code
Michael Niedermayer [Mon, 25 Mar 2013 12:32:45 +0000 (13:32 +0100)]
avcodec/gifdec: Add av_log() to workaround gcc 4.2 miscompiling the code

It appears gcc forgets to increment the byte stream pointer at -O3
I was not able to spot a reason/excuse for it to do that. It
also disappears if the function isnt inlined.

This should fix the gif fate failures on open & free bsd

See: [FFmpeg-devel] [PATCH] gifdec: workaround old gcc 4.2 mis-compiling code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxan: make decoder independent of sizeof(AVFrame)
Michael Niedermayer [Sun, 24 Mar 2013 14:19:37 +0000 (15:19 +0100)]
xan: make decoder independent of sizeof(AVFrame)

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/flacdec: Propagate and return meaningful error codes
James Almer [Wed, 20 Mar 2013 07:27:39 +0000 (04:27 -0300)]
lavc/flacdec: Propagate and return meaningful error codes

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoblend: Adding yuvj pixelformats to the blend effect
Björn S [Sun, 24 Mar 2013 12:41:19 +0000 (13:41 +0100)]
blend: Adding yuvj pixelformats to the blend effect

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 25 Mar 2013 11:13:07 +0000 (12:13 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sndio_dec: Add missing includes for av_gettime()

no change, as this has already been fixed in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: consistently use unaligned movs in the unaligned bswap
Janne Grunau [Sun, 24 Mar 2013 18:44:23 +0000 (19:44 +0100)]
x86: consistently use unaligned movs in the unaligned bswap

Fixes fate errors in asv1, ffvhuff and huffyuv on x86_32.

7 years agovsrc_testsrc: avoid floats and non bit exactness
Michael Niedermayer [Mon, 25 Mar 2013 02:01:47 +0000 (03:01 +0100)]
vsrc_testsrc: avoid floats and non bit exactness

The round to zero behavior is maintained, possibly this should
be changed to round to nearest.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/utils: initialize pixel buffer pool
Michael Niedermayer [Sun, 24 Mar 2013 01:31:20 +0000 (02:31 +0100)]
avcodec/utils: initialize pixel buffer pool

This should silence many valgrind warnings about use of uninitialized
data, all the warnings i looked at where false positives having their
uninitialized data not actually used.

The same effect could be achieved by listing all code that touches
the pixel buffer in the valgrind suppression file.
Note, valgrind also fails to trace the origins correctly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/mux: add the flush_packets option.
Nicolas George [Tue, 12 Mar 2013 15:54:42 +0000 (16:54 +0100)]
lavf/mux: add the flush_packets option.

Note: a lot of muxers already do the flushing explicitly.

7 years agolavfi: support multiple rounds of format negotiation.
Nicolas George [Thu, 21 Feb 2013 19:21:16 +0000 (20:21 +0100)]
lavfi: support multiple rounds of format negotiation.

Remove the temporary hack for amerge and replace it with a
generic solution.

7 years agolavfi/af_amerge: return EAGAIN if the input layouts are not known.
Nicolas George [Thu, 21 Feb 2013 19:15:32 +0000 (20:15 +0100)]
lavfi/af_amerge: return EAGAIN if the input layouts are not known.

Also downgrade the error to a warning.

7 years agolavfi: add test for concat.
Nicolas George [Thu, 21 Mar 2013 12:42:44 +0000 (13:42 +0100)]
lavfi: add test for concat.

7 years agoh264/field_end move progress report code after error concealment.
Michael Niedermayer [Tue, 19 Feb 2013 19:26:55 +0000 (20:26 +0100)]
h264/field_end move progress report code after error concealment.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/thumbnail: add support for named options.
Clément Bœsch [Sun, 24 Mar 2013 19:32:59 +0000 (20:32 +0100)]
lavfi/thumbnail: add support for named options.

7 years agolavfi/colormatrix: reword error message in init
Stefano Sabatini [Sun, 24 Mar 2013 12:46:15 +0000 (13:46 +0100)]
lavfi/colormatrix: reword error message in init

Change:
"source and destination color space are identical"

which is a true fact, but doesn't tell nothing about what's wrong, to:
"Source and destination color space must not be identical"

which tells more explicitly what the problem is.

7 years agolavfi/colormatrix: add support for named options
Stefano Sabatini [Sun, 24 Mar 2013 12:40:57 +0000 (13:40 +0100)]
lavfi/colormatrix: add support for named options

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

7 years agolavfi/subtitles: use standard options parsing.
Clément Bœsch [Sun, 24 Mar 2013 08:17:06 +0000 (09:17 +0100)]
lavfi/subtitles: use standard options parsing.

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

7 years agolavfi/setfield: use standard options parsing.
Clément Bœsch [Sun, 24 Mar 2013 08:11:48 +0000 (09:11 +0100)]
lavfi/setfield: use standard options parsing.

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

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

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

7 years agolavfi/histeq: use standard options parsing.
Clément Bœsch [Sun, 24 Mar 2013 08:05:51 +0000 (09:05 +0100)]
lavfi/histeq: use standard options parsing.

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

7 years agolavfi/geq: use standard options parsing.
Clément Bœsch [Sun, 24 Mar 2013 08:03:22 +0000 (09:03 +0100)]
lavfi/geq: use standard options parsing.

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

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

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

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 agosndio_dec: Add missing includes for av_gettime()
Martin Storsjö [Sun, 24 Mar 2013 10:11:58 +0000 (12:11 +0200)]
sndio_dec: 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 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>