ffmpeg.git
7 years agoffplay: report video frame changes only in debug mode
Stefano Sabatini [Sun, 3 Feb 2013 21:26:55 +0000 (22:26 +0100)]
ffplay: report video frame changes only in debug mode

In particular, remove distracting message:
"Video frame changed from size:0x0 format:none serial:-1 to ..."

7 years agoffplay: extend feedback in case of video changes
Stefano Sabatini [Sun, 3 Feb 2013 21:25:24 +0000 (22:25 +0100)]
ffplay: extend feedback in case of video changes

7 years agodvenc: dont fail hard if the timecode is invalid
Michael Niedermayer [Tue, 5 Feb 2013 21:57:35 +0000 (22:57 +0100)]
dvenc: dont fail hard if the timecode is invalid

Instead just dont store the timecode
Fixes Ticket2187

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomovtextenc: fix pointer messup and out of array accesses
Michael Niedermayer [Tue, 5 Feb 2013 20:54:02 +0000 (21:54 +0100)]
movtextenc: fix pointer messup and out of array accesses

Fixes Ticket2187

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'rdp/combined'
Michael Niedermayer [Tue, 5 Feb 2013 20:00:46 +0000 (21:00 +0100)]
Merge remote-tracking branch 'rdp/combined'

* rdp/combined:
  hdyc col
  dshow: use standardized raw pixel format lookup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoljpegenc: allocate needed scratch-buffer
Michael Niedermayer [Tue, 5 Feb 2013 17:52:07 +0000 (18:52 +0100)]
ljpegenc: allocate needed scratch-buffer

Fixes null pointer dereference
Fixes Ticket2207

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoriff: fix infinite loop
Michael Niedermayer [Tue, 5 Feb 2013 17:31:27 +0000 (18:31 +0100)]
riff: fix infinite loop

Fixes Ticket2241

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/vd_ffmpeg.h: remove, its unused and removed upstream
Michael Niedermayer [Tue, 5 Feb 2013 14:49:34 +0000 (15:49 +0100)]
libmpcodecs/vd_ffmpeg.h: remove, its unused and removed upstream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/vf_pullup: update to latest version from mplayer
multiple authors [Tue, 5 Feb 2013 13:17:54 +0000 (14:17 +0100)]
libmpcodecs/vf_pullup: update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/vf_uspp: update to latest version from mplayer
multiple authors [Tue, 5 Feb 2013 13:17:54 +0000 (14:17 +0100)]
libmpcodecs/vf_uspp: update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/vf_unsharp: update to latest version from mplayer
multiple authors [Tue, 5 Feb 2013 13:17:54 +0000 (14:17 +0100)]
libmpcodecs/vf_unsharp: update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/vf_spp: update to latest version from mplayer
multiple authors [Tue, 5 Feb 2013 13:17:54 +0000 (14:17 +0100)]
libmpcodecs/vf_spp: update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/vf_sab: update to latest version from mplayer
multiple authors [Tue, 5 Feb 2013 13:17:54 +0000 (14:17 +0100)]
libmpcodecs/vf_sab: update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/pullup: update to latest version from mplayer
multiple authors [Tue, 5 Feb 2013 13:17:54 +0000 (14:17 +0100)]
libmpcodecs/pullup: update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/vf_noise: update to latest version from mplayer
multiple authors [Tue, 5 Feb 2013 13:17:54 +0000 (14:17 +0100)]
libmpcodecs/vf_noise: update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/vf_pp7:update to latest version from mplayer
multiple authors [Tue, 5 Feb 2013 13:17:28 +0000 (14:17 +0100)]
libmpcodecs/vf_pp7:update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/vf_qp: update to latest version from mplayer
multiple authors [Tue, 5 Feb 2013 13:16:47 +0000 (14:16 +0100)]
libmpcodecs/vf_qp: update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/vf_mcdeint: update to latest version from mplayer
multiple authors [Tue, 5 Feb 2013 13:00:20 +0000 (14:00 +0100)]
libmpcodecs/vf_mcdeint: update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/vf_ilpack: update to latest version from mplayer
multiple authors [Tue, 5 Feb 2013 12:59:47 +0000 (13:59 +0100)]
libmpcodecs/vf_ilpack: update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/vf_ivtc: update to latest version from mplayer
multiple authors [Tue, 5 Feb 2013 12:59:10 +0000 (13:59 +0100)]
libmpcodecs/vf_ivtc: update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/vf_fspp: update to latest version from mplayer
multiple authors [Tue, 5 Feb 2013 12:43:51 +0000 (13:43 +0100)]
libmpcodecs/vf_fspp: update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/av_helpers: update to latest version from mplayer
multiple authors [Tue, 5 Feb 2013 12:42:14 +0000 (13:42 +0100)]
libmpcodecs/av_helpers: update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/vf_filmdint: update to latest version from mplayer
multiple authors [Tue, 5 Feb 2013 12:40:08 +0000 (13:40 +0100)]
libmpcodecs/vf_filmdint: update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/vf_divtc: update to latest version in mplayer
multiple authors [Tue, 5 Feb 2013 12:39:24 +0000 (13:39 +0100)]
libmpcodecs/vf_divtc: update to latest version in mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibhmpcodec/mp_msg: update to latest from mplayer
multiple authors [Tue, 5 Feb 2013 12:02:00 +0000 (13:02 +0100)]
libhmpcodec/mp_msg: update to latest from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/help_mp: update to latest from mplayer
multiple authors [Tue, 5 Feb 2013 11:58:20 +0000 (12:58 +0100)]
libmpcodecs/help_mp: update to latest from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/cpudetect: update to latest from mplayer
multiple authors [Tue, 5 Feb 2013 11:54:15 +0000 (12:54 +0100)]
libmpcodecs/cpudetect: update to latest from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 5 Feb 2013 10:56:23 +0000 (11:56 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avfilter: x86: consistent filenames for filter optimizations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs: update img_format.* & mp_image.* to latest from mplayer
multiple authors [Tue, 5 Feb 2013 02:23:43 +0000 (03:23 +0100)]
libmpcodecs: update img_format.* & mp_image.* to latest from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmpcodecs/vf_stereo3d: update to latest version from mplayer
multiple authors [Tue, 5 Feb 2013 01:48:01 +0000 (02:48 +0100)]
libmpcodecs/vf_stereo3d: update to latest version from mplayer

Merged commits:
commit 9a2978f37bcdf7a28235c9322e9e5a4fe15e2ff2
Author: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date:   Thu Jan 31 12:12:36 2013 +0000

    Add more vf_stereo3d output formats.

    Adds high quality green-magenta and yellow-blue dubois
    anaglyph 3D output support.

    Patch by thomas schorpp, thomas.schorpp gmail

    git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35906 b3059339-0415-0410-9bf9-f77b7e298cf2

commit 2c50e66460d8d3ec460cbf9425f252f75ea1022d
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date:   Sun Aug 12 17:31:47 2012 +0000

    Add another anaglyph color variant.

    Patch by Bob [mpbob ezpi net].

    git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35080 b3059339-0415-0410-9bf9-f77b7e298cf2

commit 71c5261c2ac63e6e29a5a899b52d1ec4bdb62c4e
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date:   Sun Aug 12 17:25:30 2012 +0000

    Convert comments into designated initializers.

    That is a simple way to ensure they always correspond
    to what the compiler actually does.

    git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35079 b3059339-0415-0410-9bf9-f77b7e298cf2

commit d7164c5e1ba524c2a6983d979ef57e193b2c8a9f
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date:   Sun Aug 12 17:20:24 2012 +0000

    Make compiler give the ana_coeff array automatically the right size.
    Makes adding more colour schemes easier.

    git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35078 b3059339-0415-0410-9bf9-f77b7e298cf2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1: check for malloc failure
Michael Niedermayer [Mon, 4 Feb 2013 23:22:29 +0000 (00:22 +0100)]
ffv1: check for malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1enc: check for malloc failure
Michael Niedermayer [Mon, 4 Feb 2013 23:20:58 +0000 (00:20 +0100)]
ffv1enc: check for malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: apply various rendering changes to the showspectrum docs
Stefano Sabatini [Mon, 4 Feb 2013 23:10:31 +0000 (00:10 +0100)]
doc/filters: apply various rendering changes to the showspectrum docs

In particular: always use @table @samp for showing constant tables, add a
few empty lines for improving readability, and specify default value when
missing.

7 years agodoc/filters: fix @item syntax in showspectrum docs
Stefano Sabatini [Mon, 4 Feb 2013 23:01:03 +0000 (00:01 +0100)]
doc/filters: fix @item syntax in showspectrum docs

In particular, fix warnings:
** Unknown command with braces `@item' (in doc/filters.texi l. 60XX)

7 years agoflacdec: silence several "warning: X may be used uninitialized in this function"
Michael Niedermayer [Mon, 4 Feb 2013 21:50:16 +0000 (22:50 +0100)]
flacdec: silence several "warning: X may be used uninitialized in this function"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowmavoice: silence may be used uninitialized warnings
Michael Niedermayer [Mon, 4 Feb 2013 21:45:47 +0000 (22:45 +0100)]
wmavoice: silence may be used uninitialized warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: x86: consistent filenames for filter optimizations
Diego Biurrun [Fri, 1 Feb 2013 12:14:31 +0000 (13:14 +0100)]
avfilter: x86: consistent filenames for filter optimizations

7 years agolavfi/showspectrum: display multiple channels in separate row
Rudolf Polzer [Fri, 1 Feb 2013 15:33:17 +0000 (16:33 +0100)]
lavfi/showspectrum: display multiple channels in separate row

The showspectrum filter gets multiple channel (any count) support.

Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
7 years agosws: Fix "warning: comparison of distinct pointer types lacks a cast"
Michael Niedermayer [Sun, 3 Feb 2013 19:36:58 +0000 (20:36 +0100)]
sws: Fix "warning: comparison of distinct pointer types lacks a cast"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1dec: Fix 2 "warning: may be used uninitialized in this function"
Michael Niedermayer [Mon, 4 Feb 2013 13:30:40 +0000 (14:30 +0100)]
vc1dec: Fix 2 "warning: may be used uninitialized in this function"

Initialize pointers to NULL for safety

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'mjbshaw/master'
Michael Niedermayer [Mon, 4 Feb 2013 12:22:49 +0000 (13:22 +0100)]
Merge remote-tracking branch 'mjbshaw/master'

* mjbshaw/master:
  libopenjpegenc: make dci compliant j2c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 4 Feb 2013 11:36:39 +0000 (12:36 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: simplify REBASE_PICTURE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibopenjpegenc: make dci compliant j2c
Michaël Cinquin [Mon, 4 Feb 2013 06:53:39 +0000 (23:53 -0700)]
libopenjpegenc: make dci compliant j2c

Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
7 years agompegvideo: simplify REBASE_PICTURE
Anton Khirnov [Thu, 31 Jan 2013 19:24:06 +0000 (20:24 +0100)]
mpegvideo: simplify REBASE_PICTURE

Always evaluate to NULL when the source Picture is not located in the
MpegEncContext.picture array. That will only happen for
next/last_picture_ptr when updating the thread context during h264 frame
threaded decoding, where they will point to elements of ref_list. Since
ref_list is not copied during updating the context and is invalid until
it is constructed for the current slice, there is no point in doing
anything complicated with next/last_picture_ptr, as they will get
updated when the ref_list is filled.

7 years agoswr: Dont use floats for S32->S32 when possible
Michael Niedermayer [Mon, 4 Feb 2013 01:36:33 +0000 (02:36 +0100)]
swr: Dont use floats for S32->S32 when possible

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: reorder init code to make rematrix status available earlier
Michael Niedermayer [Mon, 4 Feb 2013 03:00:12 +0000 (04:00 +0100)]
swr: reorder init code to make rematrix status available earlier

This also makes some other fields available earlier which may
be usefull one day

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr-test: Fix clip to 32bit
Michael Niedermayer [Mon, 4 Feb 2013 02:55:56 +0000 (03:55 +0100)]
swr-test: Fix clip to 32bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr/resample: fix integer overflow, add missing cast
Michael Niedermayer [Mon, 4 Feb 2013 02:53:10 +0000 (03:53 +0100)]
swr/resample: fix integer overflow, add missing cast

The effects of this are limited to numeric errors in the output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr/resample: fix filter rounding and cliping for s32
Michael Niedermayer [Mon, 4 Feb 2013 02:25:07 +0000 (03:25 +0100)]
swr/resample: fix filter rounding and cliping for s32

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: reformat various filter tables items
Stefano Sabatini [Sun, 3 Feb 2013 22:16:20 +0000 (23:16 +0100)]
doc/filters: reformat various filter tables items

Improve overall consistency.

7 years agolavu/parseutils: add digital cinema frame sizes
Dave Rice [Sun, 3 Feb 2013 21:57:04 +0000 (22:57 +0100)]
lavu/parseutils: add digital cinema frame sizes

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agoqdm2: disable superblocktype_2_3==0 code
Michael Niedermayer [Sun, 30 Dec 2012 02:18:46 +0000 (03:18 +0100)]
qdm2: disable superblocktype_2_3==0 code

The code is untested and contained bugs, we need a sample if any files
use this branch.

Suggested-by: Roberto Togni
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoqdm2: Fix data type used in multiplication.
Michael Niedermayer [Sun, 30 Dec 2012 02:13:30 +0000 (03:13 +0100)]
qdm2: Fix data type used in multiplication.

Avoid unintended truncation.
Fixes CID700555

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/showspectrum: set default height to 512
Rudolf Polzer [Sun, 3 Feb 2013 17:03:39 +0000 (17:03 +0000)]
lavfi/showspectrum: set default height to 512

Only power-of-two FFTs are supported; so to get a full spectrum
(that is, one up to Nyquist), the height must be a power of two.

Therefore, change the default height from 480 to 512.

Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
7 years agoput_vp_no_rnd_pixels8_l2_mmx: fix type
Michael Niedermayer [Sun, 3 Feb 2013 16:20:39 +0000 (17:20 +0100)]
put_vp_no_rnd_pixels8_l2_mmx: fix type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/syntax: add missing frame sizes
Dave Rice [Sat, 2 Feb 2013 02:11:34 +0000 (21:11 -0500)]
doc/syntax: add missing frame sizes

Adding missing frame sizes used in parseutils.c to the documentation.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agodoc/syntax: fix frame rate documentation
Dave Rice [Sat, 2 Feb 2013 02:07:59 +0000 (21:07 -0500)]
doc/syntax: fix frame rate documentation

This patch corrects a mistake in the documentation and aligns the
documentation of frame rates to the values that exist in parseutils.c.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agolavfi/pad: add support to named options
Stefano Sabatini [Fri, 1 Feb 2013 23:51:14 +0000 (00:51 +0100)]
lavfi/pad: add support to named options

7 years agoffplay: remove misleading comment from audio_decode_frame()
Stefano Sabatini [Sun, 3 Feb 2013 11:30:44 +0000 (12:30 +0100)]
ffplay: remove misleading comment from audio_decode_frame()

7 years agoffplay: rename audio_decode_frame() variable "pts" to "audio_clock0"
Stefano Sabatini [Sun, 3 Feb 2013 11:29:46 +0000 (12:29 +0100)]
ffplay: rename audio_decode_frame() variable "pts" to "audio_clock0"

The new name better expresses what the variable is.

7 years agoffplay: remove pts_ptr argument from audio_decode_frame()
Stefano Sabatini [Sat, 2 Feb 2013 15:09:24 +0000 (16:09 +0100)]
ffplay: remove pts_ptr argument from audio_decode_frame()

The argument is no longer used outside the function. Simplify.

7 years agoavcodec/x86: Add daniels copyright to the recent gcc->yasm convertions he did.
Michael Niedermayer [Sun, 3 Feb 2013 12:50:44 +0000 (13:50 +0100)]
avcodec/x86: Add daniels copyright to the recent gcc->yasm convertions he did.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: Remove superfluous MAKE variable for the build suffix
James Almer [Sun, 3 Feb 2013 02:32:56 +0000 (23:32 -0300)]
build: Remove superfluous MAKE variable for the build suffix

Use BUILDSUF instead.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoproresdsp: Fix checkheaders
James Almer [Sun, 3 Feb 2013 09:01:35 +0000 (06:01 -0300)]
proresdsp: Fix checkheaders

It's been broken since commit ac89875

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/segment: use correct spelling and value for EXT-X-ALLOW-CACHE tag
Carl Eugen Hoyos [Sun, 3 Feb 2013 10:12:49 +0000 (11:12 +0100)]
lavf/segment: use correct spelling and value for EXT-X-ALLOW-CACHE tag

Replace wrong "EXT-X-ALLOWCACHE" with "EXT-X-ALLOW-CACHE", and value 1/0
with YES/NO, as per spec.

Fix trac ticket #2228.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agoffplay: drop redundant NULL sws_freeContext() check in stream_close()
Stefano Sabatini [Sat, 2 Feb 2013 15:31:57 +0000 (16:31 +0100)]
ffplay: drop redundant NULL sws_freeContext() check in stream_close()

sws_freeContext() already checks for NULL, simplify.

7 years agoffmpeg: free attachments, fix memleak
Michael Niedermayer [Sun, 3 Feb 2013 01:45:41 +0000 (02:45 +0100)]
ffmpeg: free attachments, fix memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRequire at least three frames to autodetect loas.
Carl Eugen Hoyos [Sat, 2 Feb 2013 21:36:25 +0000 (22:36 +0100)]
Require at least three frames to autodetect loas.

7 years agoh264: skip error concealment when SPS and slices are mismatching
Michael Niedermayer [Sat, 2 Feb 2013 20:11:54 +0000 (21:11 +0100)]
h264: skip error concealment when SPS and slices are mismatching

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflacdec: skip in stream header packets
Michael Niedermayer [Sat, 2 Feb 2013 18:17:25 +0000 (19:17 +0100)]
flacdec: skip in stream header packets

This prevents warning messages on chained oggs with some demuxers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: update filter_design.txt to API changes.
Nicolas George [Thu, 29 Nov 2012 16:40:42 +0000 (17:40 +0100)]
doc: update filter_design.txt to API changes.

7 years agoh264: silence warning about array index being out of bounds
Michael Niedermayer [Sat, 2 Feb 2013 15:20:19 +0000 (16:20 +0100)]
h264: silence warning about array index being out of bounds

The index is not out of bounds, adding an assert makes gcc
realize this.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 2 Feb 2013 15:14:15 +0000 (16:14 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: step to next frame if paused when seeking
  ffplay: move up pause functions
  ffplay: remember last window dimensions
  ffplay: fix order of setting show_mode
  ffplay: dynamically allocate audio buffer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/indevs: add missing final dot in v4l2 option value description
Stefano Sabatini [Fri, 1 Feb 2013 23:54:40 +0000 (00:54 +0100)]
doc/indevs: add missing final dot in v4l2 option value description

Fix inconsistency.

7 years agolavfi/crop: fix help message for the keep_aspect option
Stefano Sabatini [Fri, 1 Feb 2013 23:41:24 +0000 (00:41 +0100)]
lavfi/crop: fix help message for the keep_aspect option

7 years agoffplay: extend doxy for audio_decode_frame()
Stefano Sabatini [Thu, 28 Jun 2012 21:46:20 +0000 (23:46 +0200)]
ffplay: extend doxy for audio_decode_frame()

7 years agolavd/alsa: simplify reordering functions definition.
Nicolas George [Sat, 2 Feb 2013 13:13:11 +0000 (14:13 +0100)]
lavd/alsa: simplify reordering functions definition.

7 years agoavfilter/vf_hqdn3d.h: restore author attribution, history and project name
Michael Niedermayer [Sat, 2 Feb 2013 11:44:26 +0000 (12:44 +0100)]
avfilter/vf_hqdn3d.h: restore author attribution, history and project name

See git blame of pre split avfilter/vf_hqdn3d.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/x86/vf_hqdn3d_init: fix author attribution & project name
Michael Niedermayer [Sat, 2 Feb 2013 11:38:44 +0000 (12:38 +0100)]
avfilter/x86/vf_hqdn3d_init: fix author attribution & project name

Reference: 7a1944b907179212e7073b821fdc60e27d536e4a

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 2 Feb 2013 12:01:45 +0000 (13:01 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_hqdn3d: x86: Add proper arch optimization initialization

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: step to next frame if paused when seeking
Marton Balint [Sat, 19 Jan 2013 00:57:50 +0000 (01:57 +0100)]
ffplay: step to next frame if paused when seeking

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: move up pause functions
Marton Balint [Sat, 19 Jan 2013 00:44:38 +0000 (01:44 +0100)]
ffplay: move up pause functions

No change in functionality.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: remember last window dimensions
Marton Balint [Sun, 27 Jan 2013 13:03:15 +0000 (14:03 +0100)]
ffplay: remember last window dimensions

After this change the dimensions of single image videos will be remembered when
coming back from full screen. The issue was mentioned in ticket #2174.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: fix order of setting show_mode
Marton Balint [Sat, 26 Jan 2013 23:45:47 +0000 (00:45 +0100)]
ffplay: fix order of setting show_mode

Without the fix the refresh event may have got called with unset show mode.

Fixes ticket #2174.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: dynamically allocate audio buffer
Marton Balint [Sat, 26 Jan 2013 21:32:39 +0000 (22:32 +0100)]
ffplay: dynamically allocate audio buffer

We simply remove the fixed length VideoState->audio_buf2 and use
the previously unused VideoState->audio_buf1.

Fixes ticket #2191.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoMap the interlaced flag of yuv4mpeg streams to AVCodecContext->field_order.
Carl Eugen Hoyos [Sat, 2 Feb 2013 11:29:58 +0000 (12:29 +0100)]
Map the interlaced flag of yuv4mpeg streams to AVCodecContext->field_order.

Fixes a part of ticket #2190.

7 years agobuild-sys: Fix pkgconfig files when ffmpeg is built with --build-suffix
Steven Boswell II [Sat, 26 Jan 2013 21:08:47 +0000 (13:08 -0800)]
build-sys: Fix pkgconfig files when ffmpeg is built with --build-suffix

Tested-on: Fedora Core 14, 16, and 17.
Tested-on: Ubuntu by commiter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoDo not fail for mixed interlaced / non-interlaced YUV4MPEG streams.
Carl Eugen Hoyos [Fri, 1 Feb 2013 22:55:54 +0000 (23:55 +0100)]
Do not fail for mixed interlaced / non-interlaced YUV4MPEG streams.

7 years agovp56: remove clear_blocks call, and clear alpha plane U/V DC only.
Ronald S. Bultje [Fri, 1 Feb 2013 19:04:50 +0000 (11:04 -0800)]
vp56: remove clear_blocks call, and clear alpha plane U/V DC only.

The non-alpha and alpha-Y planes are cleared in the idct_put/add()
calls. For the alpha U/V planes, we only care about the DC for entropy
context prediction purposes, the rest of the data is unused.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoDo not change codec in flv streams if the user has forced a codec.
Carl Eugen Hoyos [Fri, 1 Feb 2013 22:27:15 +0000 (23:27 +0100)]
Do not change codec in flv streams if the user has forced a codec.

Fixes ticket #2218.

7 years agoffmpeg: fix broken channel_layout option
Matthieu Bouron [Fri, 1 Feb 2013 17:58:14 +0000 (18:58 +0100)]
ffmpeg: fix broken channel_layout option

Fixes ticket #2163.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: fix syntax and typo for the afade curve option
Stefano Sabatini [Fri, 1 Feb 2013 17:52:42 +0000 (18:52 +0100)]
doc/filters: fix syntax and typo for the afade curve option

7 years agodoc/filters: create a dedicated examples section for lut*, and itemize
Stefano Sabatini [Fri, 1 Feb 2013 17:35:15 +0000 (18:35 +0100)]
doc/filters: create a dedicated examples section for lut*, and itemize

7 years agodoc/filters: fix syntax and description for the lut* options
Stefano Sabatini [Fri, 1 Feb 2013 17:32:21 +0000 (18:32 +0100)]
doc/filters: fix syntax and description for the lut* options

7 years agodoc/muxers: fix level for the segment options subsection
Stefano Sabatini [Fri, 1 Feb 2013 17:12:54 +0000 (18:12 +0100)]
doc/muxers: fix level for the segment options subsection

Properly declare it like a @subsection, rather than as a @section.

7 years agodoc/muxers.texi: Fix mp3 picture attachment documentation.
Carl Eugen Hoyos [Fri, 1 Feb 2013 16:54:48 +0000 (17:54 +0100)]
doc/muxers.texi: Fix mp3 picture attachment documentation.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 1 Feb 2013 13:34:18 +0000 (14:34 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Use proper "" quotes for local header #includes
  ppc: fmtconvert: Drop two unused variables.
  bink demuxer: set framerate.

Conflicts:
libavcodec/kbdwin.c
libavcodec/ppc/fmtconvert_altivec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1730ca2eca42974af0c29f38a0770997cba2f0da'
Michael Niedermayer [Fri, 1 Feb 2013 13:24:46 +0000 (14:24 +0100)]
Merge commit '1730ca2eca42974af0c29f38a0770997cba2f0da'

* commit '1730ca2eca42974af0c29f38a0770997cba2f0da':
  bink demuxer: check malloc return value

See:
commit e400b95b3205d5b861346f525cf6f423d93d2f04
Author: Paul B Mahol <onemda@gmail.com>
Date:   Sat Jun 9 10:57:14 2012 +0000

    bink: check av_mallocz() return value

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a'
Michael Niedermayer [Fri, 1 Feb 2013 12:59:00 +0000 (13:59 +0100)]
Merge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a'

* commit 'f2960097e42ddf9a356bab6547f87906f6999e0a':
  bink: fix a check for the first frame.
  doc/developer: Drop obsolete MPlayer reference
  doc/developer: Add ISC license to list of acceptable licenses
  doc/developer: Add web links for all suggested licenses

Conflicts:
doc/developer.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_hqdn3d: x86: Add proper arch optimization initialization
Diego Biurrun [Tue, 22 Jan 2013 00:39:37 +0000 (01:39 +0100)]
vf_hqdn3d: x86: Add proper arch optimization initialization