ffmpeg.git
8 years agolavfi: remove disabled code.
Nicolas George [Wed, 6 Feb 2013 13:22:15 +0000 (14:22 +0100)]
lavfi: remove disabled code.

8 years agomov: remove unused function
Michael Niedermayer [Wed, 6 Feb 2013 21:48:59 +0000 (22:48 +0100)]
mov: remove unused function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoflac: don't check the number of channels before setting the channel layout
Tim Walker [Thu, 7 Feb 2013 09:36:21 +0000 (09:36 +0000)]
flac: don't check the number of channels before setting the channel layout

This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels.

8 years agodoc: replace '×' symbol with 'x'
Stefano Sabatini [Wed, 6 Feb 2013 21:40:18 +0000 (22:40 +0100)]
doc: replace '×' symbol with 'x'

Non-ascii chars are not correctly rendered in both MAN and HTML output or
may even cause compilation failure. Thus avoid to use them until we find
a satisfying way to deal with them.

Fix trac ticket #2243.

8 years agolavf/segment: fix DTS inconsistencies with -reset_timestamps
Stefano Sabatini [Tue, 5 Feb 2013 23:19:52 +0000 (00:19 +0100)]
lavf/segment: fix DTS inconsistencies with -reset_timestamps

The DTS needs to be resynched against the segment start PTS, or the
resulting DTS may result < PTS.

Reported-by: Owen Jones <riots6@gmail.com>
See thread:
Subject: [FFmpeg-user] pts/dts error using reset_timestamps while splitting a DVD
Date: Sat, 19 Jan 2013 08:58:27 +0000

8 years agolavf/mov: skip version and flags attributes in mov_read_chan function
Matthieu Bouron [Mon, 4 Feb 2013 21:06:11 +0000 (22:06 +0100)]
lavf/mov: skip version and flags attributes in mov_read_chan function

Fixes ticket #1764.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'rdp/combined2'
Michael Niedermayer [Wed, 6 Feb 2013 19:14:09 +0000 (20:14 +0100)]
Merge remote-tracking branch 'rdp/combined2'

* rdp/combined2:
  dshow: allow for more codec ID's
  dshow: better error reporting
  dshow: fix log message

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoframecrcenc: print all side data elements, not just the first
Michael Niedermayer [Wed, 6 Feb 2013 17:17:27 +0000 (18:17 +0100)]
framecrcenc: print all side data elements, not just the first

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoframecrcenc: Also print the size of side data elements
Michael Niedermayer [Wed, 6 Feb 2013 17:17:03 +0000 (18:17 +0100)]
framecrcenc: Also print the size of side data elements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFate test to print side_data crc if present
Vignesh Venkatasubramanian [Tue, 5 Feb 2013 20:10:21 +0000 (12:10 -0800)]
Fate test to print side_data crc if present

Modified the fate test crc generator to print the side_data's
crc if side_data is present.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 6 Feb 2013 15:59:32 +0000 (16:59 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: initialize dummy reference frames.

Conflicts:
libavcodec/mpegvideo.c
tests/ref/fate/filter-yadif-mode1

The luma init is left at 0x80 as it was previously, and tested and
working since a long time. Its also mandated to be 0x80 by at least
one specification. Cases that need different values already had
code in place to handle them.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoqtrle: fix 1bit row_ptr comment
Michael Niedermayer [Wed, 6 Feb 2013 15:46:23 +0000 (16:46 +0100)]
qtrle: fix 1bit row_ptr comment

Found-by: aballier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa'
Michael Niedermayer [Wed, 6 Feb 2013 15:36:08 +0000 (16:36 +0100)]
Merge commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa'

* commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa':
  nuv: do not rely on get_buffer() initializing the frame.
  yop: initialize palette to 0

Conflicts:
libavcodec/nuv.c
tests/ref/fate/nuv-rtjpeg-fh
tests/ref/fate/yop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '8136f234445862c94d1c081606b2d1e3d44fccf3'
Michael Niedermayer [Wed, 6 Feb 2013 15:09:25 +0000 (16:09 +0100)]
Merge commit '8136f234445862c94d1c081606b2d1e3d44fccf3'

* commit '8136f234445862c94d1c081606b2d1e3d44fccf3':
  yop: check for input overreads.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '06cf597c352519d2b70f293518c61b8c312f5d4f'
Michael Niedermayer [Wed, 6 Feb 2013 15:05:06 +0000 (16:05 +0100)]
Merge commit '06cf597c352519d2b70f293518c61b8c312f5d4f'

* commit '06cf597c352519d2b70f293518c61b8c312f5d4f':
  yop: check that extradata is large enough.

Conflicts:
libavcodec/yop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '89f11f498b9c15bc71494a11a7ec560f4adf630d'
Michael Niedermayer [Wed, 6 Feb 2013 14:56:24 +0000 (15:56 +0100)]
Merge commit '89f11f498b9c15bc71494a11a7ec560f4adf630d'

* commit '89f11f498b9c15bc71494a11a7ec560f4adf630d':
  qtrle: fix the topmost line for 1bit

Conflicts:
tests/ref/fate/qtrle-1bit

See: 1af91978dbab35ba9fdede187577c00d643ae33b

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '685e6f2e3939f124b41c7801cc541dad8252af3d'
Michael Niedermayer [Wed, 6 Feb 2013 14:26:24 +0000 (15:26 +0100)]
Merge commit '685e6f2e3939f124b41c7801cc541dad8252af3d'

* commit '685e6f2e3939f124b41c7801cc541dad8252af3d':
  xxan: properly handle odd heights.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '2cd4068071b9a8908823a3107f97e938211045ce'
Michael Niedermayer [Wed, 6 Feb 2013 14:21:39 +0000 (15:21 +0100)]
Merge commit '2cd4068071b9a8908823a3107f97e938211045ce'

* commit '2cd4068071b9a8908823a3107f97e938211045ce':
  fraps: fix off-by one bug for version 1.

Conflicts:
libavcodec/fraps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177'
Michael Niedermayer [Wed, 6 Feb 2013 14:11:14 +0000 (15:11 +0100)]
Merge commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177'

* commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177':
  aasc: fix output for msrle compression.
  msrledec: check bounds before constructing a possibly invalid pointer,
  cmdutils: remove ansi from the list of broken codecs.

Conflicts:
tests/ref/fate/aasc

Also See: e7117f1c1058d41eb759d1613e849c29b15c85b5

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '238614de679a71970c20d7c3fee08a322967ec40'
Michael Niedermayer [Wed, 6 Feb 2013 13:53:49 +0000 (14:53 +0100)]
Merge commit '238614de679a71970c20d7c3fee08a322967ec40'

* commit '238614de679a71970c20d7c3fee08a322967ec40':
  cdgraphics: do not rely on get_buffer() initializing the frame.
  svq1: replace struct svq1_frame_size with an array.
  vf_yadif: silence a warning.

Conflicts:
libavcodec/svq1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '48a4ffa722c0874b251de9d201babed52cef0bcb'
Michael Niedermayer [Wed, 6 Feb 2013 13:10:26 +0000 (14:10 +0100)]
Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb'

* commit '48a4ffa722c0874b251de9d201babed52cef0bcb':
  asf: K&R formatting cosmetics
  vc1dec: use codec_id instead of codec_tag for VC1IMAGE
  sh4: drop unused functions

Conflicts:
libavformat/asf.c
libavformat/asfdec.c
libavformat/asfenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoflac: add channel layout masks for streams with 7 or 8 channels
Tim Walker [Wed, 6 Feb 2013 12:53:15 +0000 (12:53 +0000)]
flac: add channel layout masks for streams with 7 or 8 channels

They were added to the latest FLAC specification:
https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2

8 years agolavc/bink: Chech for malloc failure
James Almer [Wed, 6 Feb 2013 01:34:29 +0000 (22:34 -0300)]
lavc/bink: Chech for malloc failure

Signed-off-by: James Almer <jamrial@gmail.com>
8 years agoMerge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'
Michael Niedermayer [Wed, 6 Feb 2013 12:27:24 +0000 (13:27 +0100)]
Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

* commit '620289a20e022b9c16c10d546ef86cc0bb77cc84':
  sh4: Fix silly type vs. variable name search and replace typo
  configure: Group all hwaccels together in a separate variable
  Add av_cold attributes to arch-specific init functions

Conflicts:
configure
libavcodec/arm/mpegvideo_armv5te.c
libavcodec/x86/mlpdsp.c
libavcodec/x86/motion_est.c
libavcodec/x86/mpegvideoenc.c
libavcodec/x86/videodsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodsputil: fixup half a dozen bugs with ptrdiff vs int linesize
Michael Niedermayer [Wed, 6 Feb 2013 12:16:31 +0000 (13:16 +0100)]
dsputil: fixup half a dozen bugs with ptrdiff vs int linesize

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '25841dfe806a13de526ae09c11149ab1f83555a8'
Michael Niedermayer [Wed, 6 Feb 2013 11:18:25 +0000 (12:18 +0100)]
Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8'

* commit '25841dfe806a13de526ae09c11149ab1f83555a8':
  Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter.

Conflicts:
libavcodec/alpha/dsputil_alpha.c
libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegvideo: initialize dummy reference frames.
Anton Khirnov [Wed, 30 Jan 2013 15:37:31 +0000 (16:37 +0100)]
mpegvideo: initialize dummy reference frames.

Do not rely on get_buffer initializing them.

Changes yadif tests (off by one in one border pixel), because yadif
reads from those uninitialized lines.

8 years agonuv: do not rely on get_buffer() initializing the frame.
Anton Khirnov [Wed, 30 Jan 2013 14:04:51 +0000 (15:04 +0100)]
nuv: do not rely on get_buffer() initializing the frame.

8 years agoyop: check for input overreads.
Anton Khirnov [Wed, 30 Jan 2013 06:15:04 +0000 (07:15 +0100)]
yop: check for input overreads.

CC:libav-stable@libav.org

8 years agoyop: check that extradata is large enough.
Anton Khirnov [Wed, 30 Jan 2013 06:00:50 +0000 (07:00 +0100)]
yop: check that extradata is large enough.

CC:libav-stable@libav.org

8 years agoqtrle: fix the topmost line for 1bit
Kostya Shishkov [Wed, 30 Jan 2013 05:42:17 +0000 (06:42 +0100)]
qtrle: fix the topmost line for 1bit

Signed-off-by: Anton Khirnov <anton@khirnov.net>
CC:libav-stable@libav.org

8 years agoxxan: properly handle odd heights.
Kostya Shishkov [Tue, 29 Jan 2013 18:53:04 +0000 (19:53 +0100)]
xxan: properly handle odd heights.

Duplicate the last one or two chroma lines.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
CC:libav-stable@libav.org

8 years agofraps: fix off-by one bug for version 1.
Anton Khirnov [Tue, 29 Jan 2013 16:19:08 +0000 (17:19 +0100)]
fraps: fix off-by one bug for version 1.

CC:libav-stable@libav.org

8 years agoaasc: fix output for msrle compression.
Anton Khirnov [Tue, 29 Jan 2013 11:42:54 +0000 (12:42 +0100)]
aasc: fix output for msrle compression.

The bottom line was invalid before.

CC:libav-stable@libav.org

8 years agocdgraphics: do not rely on get_buffer() initializing the frame.
Anton Khirnov [Sat, 26 Jan 2013 21:02:19 +0000 (22:02 +0100)]
cdgraphics: do not rely on get_buffer() initializing the frame.

Setting it to zero (instead of 128, as the default get_buffer() does)
also produces more correctly-looking output.

8 years agoyop: initialize palette to 0
Anton Khirnov [Wed, 30 Jan 2013 13:33:53 +0000 (14:33 +0100)]
yop: initialize palette to 0

The FATE sample contains some pixels with value 0, but the palette
stored in the file contains only values from 16 up. Because the default
and cmdutils get_buffer() initialize the data to 0x80, they appear as
gray dots.
After this commit they change to black dots, which is probably still
incorrect but less visible and doesn't rely on get_buffer() initializing
the data.

8 years agomsrledec: check bounds before constructing a possibly invalid pointer,
Anton Khirnov [Tue, 29 Jan 2013 11:24:09 +0000 (12:24 +0100)]
msrledec: check bounds before constructing a possibly invalid pointer,

CC:libav-stable@libav.org

8 years agosvq1: replace struct svq1_frame_size with an array.
Anton Khirnov [Sat, 26 Jan 2013 20:10:54 +0000 (21:10 +0100)]
svq1: replace struct svq1_frame_size with an array.

It is used as an array in svq1enc, so this is more correct.

8 years agocmdutils: remove ansi from the list of broken codecs.
Anton Khirnov [Sat, 26 Jan 2013 21:04:49 +0000 (22:04 +0100)]
cmdutils: remove ansi from the list of broken codecs.

It's not relying on get_buffer() initializing the frame since
99e36ddd3ee57c38e6ca9e240ba518848487f849.

8 years agovf_yadif: silence a warning.
Anton Khirnov [Sat, 26 Jan 2013 19:49:16 +0000 (20:49 +0100)]
vf_yadif: silence a warning.

clang says:
libavfilter/vf_yadif.c:192:28: warning: incompatible pointer types assigning to
'void (*)(uint8_t *, uint8_t *, uint8_t *, uint8_t *, int, int, int, int, int)'
from 'void (uint16_t *, uint16_t *, uint16_t *, uint16_t *, int, int, int, int, int)'

8 years agoasf: K&R formatting cosmetics
Diego Biurrun [Tue, 5 Feb 2013 23:44:00 +0000 (00:44 +0100)]
asf: K&R formatting cosmetics

8 years agovc1dec: use codec_id instead of codec_tag for VC1IMAGE
Vladimir Pantelic [Tue, 5 Feb 2013 12:31:43 +0000 (13:31 +0100)]
vc1dec: use codec_id instead of codec_tag for VC1IMAGE

the rest of the code is using codec_id everywhere already

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
8 years agoffmpeg: do not call exit from exit_program()
Michael Niedermayer [Wed, 6 Feb 2013 03:03:52 +0000 (04:03 +0100)]
ffmpeg: do not call exit from exit_program()

This should fix  Ticket2116

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovdpau: Rename union, avoid name conflict with vdpau
Michael Niedermayer [Tue, 5 Feb 2013 19:17:42 +0000 (20:17 +0100)]
vdpau: Rename union, avoid name conflict with vdpau

Fixes Ticket2203

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: dont allow -flags to override -pass
Michael Niedermayer [Wed, 6 Feb 2013 00:25:52 +0000 (01:25 +0100)]
ffmpeg: dont allow -flags to override -pass

Fixes Ticket2154

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf/segment: extend PTS debugging log with -reset_timestamps
Stefano Sabatini [Tue, 5 Feb 2013 11:25:24 +0000 (12:25 +0100)]
lavf/segment: extend PTS debugging log with -reset_timestamps

8 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 ..."

8 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

8 years agosh4: drop unused functions
Luca Barbato [Tue, 5 Feb 2013 21:56:24 +0000 (22:56 +0100)]
sh4: drop unused functions

{avg,put}_pixels4_c are not used.

8 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>
8 years agosh4: Fix silly type vs. variable name search and replace typo
Diego Biurrun [Tue, 5 Feb 2013 21:26:57 +0000 (22:26 +0100)]
sh4: Fix silly type vs. variable name search and replace typo

8 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>
8 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>
8 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>
8 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>
8 years agoconfigure: Group all hwaccels together in a separate variable
Diego Biurrun [Tue, 5 Feb 2013 14:32:24 +0000 (15:32 +0100)]
configure: Group all hwaccels together in a separate variable

8 years agoAdd av_cold attributes to arch-specific init functions
Diego Biurrun [Fri, 1 Feb 2013 09:31:59 +0000 (10:31 +0100)]
Add av_cold attributes to arch-specific init functions

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 years agoUse ptrdiff_t instead of int for {avg, put}_pixels line_size parameter.
Diego Biurrun [Tue, 29 Jan 2013 21:13:55 +0000 (22:13 +0100)]
Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter.

This avoids SIMD-optimized functions having to sign-extend their
line size argument manually to be able to do pointer arithmetic.

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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.

8 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)

8 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>
8 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>
8 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

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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.

8 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>
8 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>
8 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>
8 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>
8 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>