ffmpeg.git
7 years agoMerge commit '481575d255195c6c2f32e04686b94de984ae78d4'
Michael Niedermayer [Wed, 8 May 2013 10:07:56 +0000 (12:07 +0200)]
Merge commit '481575d255195c6c2f32e04686b94de984ae78d4'

* commit '481575d255195c6c2f32e04686b94de984ae78d4':
  avconv: remove -deinterlace

Conflicts:
Changelog
doc/ffmpeg.texi
ffmpeg.c
ffmpeg_opt.c

The merge removes the documentation for the deprecated -deinterlace
the code itself has already been replaced a while ago by code
that inserts yadif, that insertion code is left in place.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8'
Michael Niedermayer [Wed, 8 May 2013 09:54:23 +0000 (11:54 +0200)]
Merge commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8'

* commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8':
  indeo3: use unaligned reads on reference blocks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c'
Michael Niedermayer [Wed, 8 May 2013 09:46:36 +0000 (11:46 +0200)]
Merge commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c'

* commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c':
  jpeg2000dec: initialize static data just once

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '45a1694fde251ee56e23aec073d73172c00aa470'
Michael Niedermayer [Wed, 8 May 2013 09:41:54 +0000 (11:41 +0200)]
Merge commit '45a1694fde251ee56e23aec073d73172c00aa470'

* commit '45a1694fde251ee56e23aec073d73172c00aa470':
  jpeg2000dec: cleanup properly after decoding errors

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: sbrdsp: force PIC addressing for Win64
Christophe Gisquet [Tue, 7 May 2013 20:35:22 +0000 (20:35 +0000)]
x86: sbrdsp: force PIC addressing for Win64

MSVC complains about the 32bits addressing, while mingw/gcc does not.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/unsharp: use verbal form in help message options
Stefano Sabatini [Sat, 4 May 2013 13:16:11 +0000 (15:16 +0200)]
lavfi/unsharp: use verbal form in help message options

7 years agolavu/mem: fix potential int overflow and crash in av_dynarray_add()
Stefano Sabatini [Wed, 24 Apr 2013 22:27:46 +0000 (00:27 +0200)]
lavu/mem: fix potential int overflow and crash in av_dynarray_add()

Also extend documentation accordingly.

7 years agolavu/mem: extend documentation for av_dynarray_add()
Stefano Sabatini [Wed, 24 Apr 2013 22:06:13 +0000 (00:06 +0200)]
lavu/mem: extend documentation for av_dynarray_add()

In particular, mention the fact that the amortized element addition cost
is constant.

7 years agoavcodec/mpegvideo: Fix edge emu with lowres
Michael Niedermayer [Tue, 7 May 2013 23:18:56 +0000 (01:18 +0200)]
avcodec/mpegvideo: Fix edge emu with lowres

Fixes a few green artifacts at the top
Fixes rest of Ticket 2535

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/mpegvideo: Fix block height for lowres 3 interlaced blocks
Michael Niedermayer [Tue, 7 May 2013 23:17:45 +0000 (01:17 +0200)]
avcodec/mpegvideo: Fix block height for lowres 3 interlaced blocks

Fixes green trash
Fixes part of Ticket2535

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Tue, 7 May 2013 21:28:12 +0000 (23:28 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi: add comments to explain the negotiation loop.
  lavfi: fix filter format negotiation loop.
  ffmpeg: move a local variable definition later.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/vqf: check number of channels before use.
Michael Niedermayer [Tue, 7 May 2013 20:26:22 +0000 (22:26 +0200)]
avformat/vqf: check number of channels before use.

Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosanm: Check dimensions before use
Michael Niedermayer [Tue, 7 May 2013 19:58:27 +0000 (21:58 +0200)]
sanm: Check dimensions before use

Fixes integer overflow and out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/cdgraphics: check buffer size before use
Michael Niedermayer [Tue, 7 May 2013 19:04:33 +0000 (21:04 +0200)]
avcodec/cdgraphics: check buffer size before use

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodxa: check vectors of 2x2 motion blocks
Michael Niedermayer [Tue, 7 May 2013 18:33:33 +0000 (20:33 +0200)]
dxa: check vectors of 2x2 motion blocks

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodxa: check vectors of 4x4 motion blocks
Michael Niedermayer [Tue, 7 May 2013 18:18:41 +0000 (20:18 +0200)]
dxa: check vectors of 4x4 motion blocks

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoshorten: allocate space for padding
Michael Niedermayer [Tue, 7 May 2013 17:57:10 +0000 (19:57 +0200)]
shorten: allocate space for padding

Fixes array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: add comments to explain the negotiation loop.
Nicolas George [Mon, 6 May 2013 12:09:53 +0000 (14:09 +0200)]
lavfi: add comments to explain the negotiation loop.

7 years agolavfi: fix filter format negotiation loop.
Nicolas George [Mon, 6 May 2013 11:46:23 +0000 (13:46 +0200)]
lavfi: fix filter format negotiation loop.

query_formats() returning EAGAIN is not considered a progress
in the format negotiation.

If the filter returns EAGAIN but did set some of its formats
lists, it could be considered a partial success and counted
as progress in the negotiation. Not counting it is not a
problem because it currently only happens in the first round,
where there will always be some progress on the other filters.

7 years agoffmpeg: move a local variable definition later.
Nicolas George [Mon, 6 May 2013 21:51:27 +0000 (23:51 +0200)]
ffmpeg: move a local variable definition later.

Fix a segfault when using the -map option without input files.

7 years agogifdec: reset previous Graphic Control Extension disposal type
Michael Niedermayer [Tue, 7 May 2013 14:07:27 +0000 (16:07 +0200)]
gifdec: reset previous Graphic Control Extension disposal type

This fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/overlay: reindent fix.
Clément Bœsch [Wed, 1 May 2013 12:34:21 +0000 (14:34 +0200)]
lavfi/overlay: reindent fix.

7 years agolavfi/alphaextract: copy width and not linesize.
Clément Bœsch [Wed, 1 May 2013 12:27:23 +0000 (14:27 +0200)]
lavfi/alphaextract: copy width and not linesize.

Padding data is not supposed to be copied.

7 years agosws: factorize rgb 9+ planar funcs declarations.
Clément Bœsch [Sun, 21 Apr 2013 20:31:36 +0000 (22:31 +0200)]
sws: factorize rgb 9+ planar funcs declarations.

7 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 7 May 2013 12:21:45 +0000 (14:21 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Support decoding of Lagarith frame type FRAME_SOLID_COLOR.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoTicket #2540 Enable threading when using -c:v libx264rgb
Gunther Piez [Tue, 7 May 2013 09:32:15 +0000 (11:32 +0200)]
Ticket #2540 Enable threading when using -c:v libx264rgb

Signed-off-by: Gunther Piez <gupiez@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/av_pix_fmt_swap_endianness: simplify and fix code
Michael Niedermayer [Tue, 7 May 2013 10:59:20 +0000 (12:59 +0200)]
avutil/av_pix_fmt_swap_endianness: simplify and fix code

This makes the code also more robust, not having a hard-coded
table that can become (and was) incomplete.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavconv: remove -deinterlace
Anton Khirnov [Sat, 4 May 2013 12:15:06 +0000 (14:15 +0200)]
avconv: remove -deinterlace

It is incompatible with refcounted frames and since it's been deprecated
for a long time now, fixing it is not worth the effort.

7 years agoindeo3: use unaligned reads on reference blocks.
Anton Khirnov [Sat, 4 May 2013 07:51:17 +0000 (09:51 +0200)]
indeo3: use unaligned reads on reference blocks.

They are not guaranteed to be aligned.
Fixes Bug 503.

CC:libav-stable@libav.org

7 years agoSupport decoding of Lagarith frame type FRAME_SOLID_COLOR.
Carl Eugen Hoyos [Mon, 6 May 2013 20:40:38 +0000 (22:40 +0200)]
Support decoding of Lagarith frame type FRAME_SOLID_COLOR.

Fixes bug 459.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 7 May 2013 09:33:28 +0000 (11:33 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate-jpeg2000-dcinema: force output to xyz12le

Conflicts:
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'
Michael Niedermayer [Tue, 7 May 2013 09:23:55 +0000 (11:23 +0200)]
Merge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'

* commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110':
  vf_scale: add endianness conversion pixel format in query_formats

Conflicts:
libavfilter/vf_scale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'
Michael Niedermayer [Tue, 7 May 2013 09:13:46 +0000 (11:13 +0200)]
Merge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'

* commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c':
  swscale: support endianness conversion for AV_PIX_FMT_XYZ12

Conflicts:
libswscale/swscale_unscaled.c
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'
Michael Niedermayer [Tue, 7 May 2013 08:59:26 +0000 (10:59 +0200)]
Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'

* commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491':
  swscale: add support for endianness only conversion

Conflicts:
libswscale/utils.c
libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '74652af821d7e526a6541876a637fbf81261fa8e'
Michael Niedermayer [Tue, 7 May 2013 08:47:25 +0000 (10:47 +0200)]
Merge commit '74652af821d7e526a6541876a637fbf81261fa8e'

* commit '74652af821d7e526a6541876a637fbf81261fa8e':
  pixdesc: add function to return pixel format with swapped endiannes

Conflicts:
libavutil/pixdesc.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAdd FATE test for matroska error recovery.
Reimar Döffinger [Sun, 5 May 2013 07:53:58 +0000 (09:53 +0200)]
Add FATE test for matroska error recovery.

This is the first 2 MB of the official test7.mkv.
That length seems to be enough to detect the bugs
we had in our code so far.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agomatroska: set "done" only during resync fail.
Reimar Döffinger [Sun, 5 May 2013 07:46:37 +0000 (09:46 +0200)]
matroska: set "done" only during resync fail.

Fixes playback of test7.mkv validation test file.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoavcodec/utils: Fix leak by dereferencing audio frame when side data causes whole...
Matt Wolenetz [Mon, 6 May 2013 21:44:17 +0000 (14:44 -0700)]
avcodec/utils: Fix leak by dereferencing audio frame when side data causes whole frame skip

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg2000dec: fix memleaks in error cases in jpeg2000_decode_frame()
Michael Niedermayer [Mon, 6 May 2013 20:06:15 +0000 (22:06 +0200)]
jpeg2000dec: fix memleaks in error cases in jpeg2000_decode_frame()

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/mpsub: remove sscanf from probing.
Clément Bœsch [Mon, 6 May 2013 20:48:36 +0000 (22:48 +0200)]
lavf/mpsub: remove sscanf from probing.

This should make probing faster.

7 years agojpeg2000dec: initialize static data just once
Janne Grunau [Mon, 6 May 2013 20:42:27 +0000 (22:42 +0200)]
jpeg2000dec: initialize static data just once

7 years agojpeg2000dec: cleanup properly after decoding errors
Janne Grunau [Mon, 6 May 2013 20:27:33 +0000 (22:27 +0200)]
jpeg2000dec: cleanup properly after decoding errors

Fixes memory leak in fate-redcode-demux.

7 years agoCosmetics: Fix indentation and add braces after last commit.
Carl Eugen Hoyos [Mon, 6 May 2013 19:31:36 +0000 (21:31 +0200)]
Cosmetics: Fix indentation and add braces after last commit.

7 years agovc1dec: Call ff_vdpau_vc1_decode_picture() once for each field.
Carl Eugen Hoyos [Mon, 6 May 2013 19:28:59 +0000 (21:28 +0200)]
vc1dec: Call ff_vdpau_vc1_decode_picture() once for each field.

Fixes mplayer -vc ffvc1vdpau for interlaced streams.

7 years agoFix vdpau vc1 interlace modes also when using decoder vc1_vdpau.
Rainer Hochecker [Mon, 6 May 2013 19:27:59 +0000 (21:27 +0200)]
Fix vdpau vc1 interlace modes also when using decoder vc1_vdpau.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
7 years agofate-jpeg2000-dcinema: force output to xyz12le
Janne Grunau [Mon, 22 Apr 2013 14:19:37 +0000 (16:19 +0200)]
fate-jpeg2000-dcinema: force output to xyz12le

Fixes Fate tests on big-endian configs.

7 years agovf_scale: add endianness conversion pixel format in query_formats
Janne Grunau [Fri, 26 Apr 2013 12:49:43 +0000 (14:49 +0200)]
vf_scale: add endianness conversion pixel format in query_formats

7 years agoswscale: support endianness conversion for AV_PIX_FMT_XYZ12
Janne Grunau [Fri, 26 Apr 2013 12:47:50 +0000 (14:47 +0200)]
swscale: support endianness conversion for AV_PIX_FMT_XYZ12

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 6 May 2013 19:47:55 +0000 (21:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: Use alpha from the right row in yuva2rgba_c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50'
Michael Niedermayer [Mon, 6 May 2013 19:15:47 +0000 (21:15 +0200)]
Merge commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50'

* commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50':
  swscale: Remove unnecessary backslashes
  jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg2000: fix for uninitialized data errors in valgrind/memcheck
Nicolas Bertrand [Mon, 29 Apr 2013 10:25:09 +0000 (12:25 +0200)]
jpeg2000: fix for uninitialized data errors in valgrind/memcheck

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '110796739ab32854dc0b6b0a1c95e6ae98889062'
Michael Niedermayer [Mon, 6 May 2013 18:59:52 +0000 (20:59 +0200)]
Merge commit '110796739ab32854dc0b6b0a1c95e6ae98889062'

* commit '110796739ab32854dc0b6b0a1c95e6ae98889062':
  x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c'
Michael Niedermayer [Mon, 6 May 2013 18:53:37 +0000 (20:53 +0200)]
Merge commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c'

* commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c':
  x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e'
Michael Niedermayer [Mon, 6 May 2013 18:46:27 +0000 (20:46 +0200)]
Merge commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e'

* commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e':
  x86: More specific ifdefs for dsputil/hpeldsp init functions

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: add support for endianness only conversion
Janne Grunau [Fri, 26 Apr 2013 12:47:08 +0000 (14:47 +0200)]
swscale: add support for endianness only conversion

Use bitfields in FormatEntry array to avoid wasting an int for each flag.

7 years agopixdesc: add function to return pixel format with swapped endiannes
Janne Grunau [Fri, 26 Apr 2013 12:43:02 +0000 (14:43 +0200)]
pixdesc: add function to return pixel format with swapped endiannes

7 years agosnow: add av_cold where appropriate
Michael Niedermayer [Mon, 6 May 2013 14:58:17 +0000 (16:58 +0200)]
snow: add av_cold where appropriate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: add av_cold to uninit()
Michael Niedermayer [Mon, 6 May 2013 14:55:06 +0000 (16:55 +0200)]
avfilter: add av_cold to uninit()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: Use alpha from the right row in yuva2rgba_c
Martin Storsjö [Mon, 6 May 2013 11:48:25 +0000 (14:48 +0300)]
swscale: Use alpha from the right row in yuva2rgba_c

Every other pixel had the alpha channel taken from the wrong
row.

This fixes bug 504.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoswscale: Remove unnecessary backslashes
Martin Storsjö [Mon, 6 May 2013 11:48:02 +0000 (14:48 +0300)]
swscale: Remove unnecessary backslashes

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoj2kdec: frame multithreading support
Michael Niedermayer [Sun, 28 Apr 2013 14:38:06 +0000 (16:38 +0200)]
j2kdec: frame multithreading support

This allows comparing the 2 decoders with threads

Based on:commit 2e2d24667a2c5cc7af94cfa7b63bb9ec1c04224b
By: Nicolas Bertrand <nicoinattendu@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/deshake_opencl: use ff_opencl_set_parameter
highgod0401 [Mon, 6 May 2013 02:02:50 +0000 (10:02 +0800)]
lavfi/deshake_opencl: use ff_opencl_set_parameter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck
Nicolas Bertrand [Tue, 30 Apr 2013 09:09:55 +0000 (11:09 +0200)]
jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Mon, 6 May 2013 10:24:18 +0000 (12:24 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Remove a superfluous include from libavcodec/options_table.h.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRemove a superfluous include from libavcodec/options_table.h.
Carl Eugen Hoyos [Mon, 6 May 2013 10:16:50 +0000 (12:16 +0200)]
Remove a superfluous include from libavcodec/options_table.h.

7 years agolavfi/unsharp_opencl: use av_opencl_errstr
highgod0401 [Mon, 6 May 2013 01:54:28 +0000 (09:54 +0800)]
lavfi/unsharp_opencl: use av_opencl_errstr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/opencl_internal: use av_opencl_errstr
highgod0401 [Mon, 6 May 2013 01:46:44 +0000 (09:46 +0800)]
lavu/opencl_internal: use av_opencl_errstr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/unsharp: fix opencl crash on 64bit linux
highgod0401 [Mon, 6 May 2013 03:34:45 +0000 (11:34 +0800)]
lavfi/unsharp: fix opencl crash on 64bit linux

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c
Diego Biurrun [Tue, 23 Apr 2013 16:36:25 +0000 (18:36 +0200)]
x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c

The function is only instantiated once, so there is no point
in keeping it in a template file.

7 years agox86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled
Diego Biurrun [Sun, 5 May 2013 23:01:05 +0000 (01:01 +0200)]
x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled

7 years agox86: More specific ifdefs for dsputil/hpeldsp init functions
Diego Biurrun [Sun, 5 May 2013 22:58:07 +0000 (00:58 +0200)]
x86: More specific ifdefs for dsputil/hpeldsp init functions

7 years agowav_seek_tag: fix integer overflow
Michael Niedermayer [Mon, 6 May 2013 08:58:31 +0000 (10:58 +0200)]
wav_seek_tag: fix integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 6 May 2013 08:47:49 +0000 (10:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wav: Always seek to an even offset

Conflicts:
libavformat/wavdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '46c1917350f58dfab84e41919e6c02d43950db8c'
Michael Niedermayer [Mon, 6 May 2013 08:34:26 +0000 (10:34 +0200)]
Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'

* commit '46c1917350f58dfab84e41919e6c02d43950db8c':
  nut: use a define for the nut version
  bgmc: Do not mark ff_bgmc_decode_init() as av_cold

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'bd8ac882140a38868c33c000a430a1292a352533'
Michael Niedermayer [Mon, 6 May 2013 08:27:54 +0000 (10:27 +0200)]
Merge commit 'bd8ac882140a38868c33c000a430a1292a352533'

* commit 'bd8ac882140a38868c33c000a430a1292a352533':
  avcodec: Add av_cold attributes to end functions missing them

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'
Michael Niedermayer [Mon, 6 May 2013 08:19:56 +0000 (10:19 +0200)]
Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

* commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43':
  avformat: Add av_cold attributes to init functions missing them

Conflicts:
libavformat/rtpdec_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowav: Always seek to an even offset
Luca Barbato [Sat, 4 May 2013 10:18:57 +0000 (12:18 +0200)]
wav: Always seek to an even offset

RIFF chunks are aligned to 16bit according to the specification.

Bug-Id:500
CC:libav-stable@libav.org

7 years agonut: use a define for the nut version
Luca Barbato [Sat, 4 May 2013 10:47:15 +0000 (12:47 +0200)]
nut: use a define for the nut version

Ease switching version in the future and make evident why that value.

7 years agoid3v2: stop ignoring text encoding for chapter titles
Paul B Mahol [Mon, 6 May 2013 00:54:13 +0000 (00:54 +0000)]
id3v2: stop ignoring text encoding for chapter titles

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoh264: check mb_width/height
Michael Niedermayer [Sun, 5 May 2013 23:37:34 +0000 (01:37 +0200)]
h264: check mb_width/height

Fixes inconsistency that leads to out of array accesses with threads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoff_h264_decode_seq_parameter_set: dont set h->sps
Michael Niedermayer [Sun, 5 May 2013 22:03:57 +0000 (00:03 +0200)]
ff_h264_decode_seq_parameter_set: dont set h->sps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264_sei/decode_picture_timing: do not depend on h->sps being set
Michael Niedermayer [Sun, 5 May 2013 22:27:58 +0000 (00:27 +0200)]
h264_sei/decode_picture_timing: do not depend on h->sps being set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoff_h264_decode_picture_parameter_set: fix return code
Michael Niedermayer [Sun, 5 May 2013 22:01:47 +0000 (00:01 +0200)]
ff_h264_decode_picture_parameter_set: fix return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoff_h264_decode_picture_parameter_set: use the correct sps
Michael Niedermayer [Sun, 5 May 2013 22:01:05 +0000 (00:01 +0200)]
ff_h264_decode_picture_parameter_set: use the correct sps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobgmc: Do not mark ff_bgmc_decode_init() as av_cold
Diego Biurrun [Sun, 5 May 2013 18:51:52 +0000 (20:51 +0200)]
bgmc: Do not mark ff_bgmc_decode_init() as av_cold

The function is possibly called once per block.

7 years agoavcodec: Add av_cold attributes to end functions missing them
Diego Biurrun [Thu, 2 May 2013 08:20:12 +0000 (10:20 +0200)]
avcodec: Add av_cold attributes to end functions missing them

7 years agoCosmetics: Reindent Sierra vmd demuxer after last commit.
Carl Eugen Hoyos [Sun, 5 May 2013 17:56:46 +0000 (19:56 +0200)]
Cosmetics: Reindent Sierra vmd demuxer after last commit.

7 years agoSupport demuxing of audio-only vmd files.
Carl Eugen Hoyos [Sun, 5 May 2013 17:52:30 +0000 (19:52 +0200)]
Support demuxing of audio-only vmd files.

Reviewed-by: Paul B Mahol
7 years agoFix type of shared flac table ff_flac_blocksize_table[].
Carl Eugen Hoyos [Sun, 5 May 2013 17:29:00 +0000 (19:29 +0200)]
Fix type of shared flac table ff_flac_blocksize_table[].

Fixes ticket #2533.

7 years agoavformat: Add av_cold attributes to init functions missing them
Diego Biurrun [Thu, 18 Apr 2013 13:54:26 +0000 (15:54 +0200)]
avformat: Add av_cold attributes to init functions missing them

7 years agoMerge branch 'vdpau' of https://github.com/FernetMenta/FFmpeg
Michael Niedermayer [Sun, 5 May 2013 14:28:09 +0000 (16:28 +0200)]
Merge branch 'vdpau' of https://github.com/FernetMenta/FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: Use the tool specified with --valgrind instead of a hardcoded "valgrind"
Michael Niedermayer [Sun, 5 May 2013 14:22:44 +0000 (16:22 +0200)]
configure: Use the tool specified with --valgrind instead of a hardcoded "valgrind"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: set valgrind-memcheck toolchain when --valgrind is specified
Michael Niedermayer [Sun, 5 May 2013 14:21:57 +0000 (16:21 +0200)]
configure: set valgrind-memcheck toolchain when --valgrind is specified

This avoids duplicating the default command line arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoregister AV_PIX_FMT_VDPAU for hwaccel
Rainer Hochecker [Sun, 5 May 2013 14:15:41 +0000 (16:15 +0200)]
register AV_PIX_FMT_VDPAU for hwaccel

7 years agofix vdpau vc1 interlace modes
Rainer Hochecker [Sun, 5 May 2013 13:12:59 +0000 (15:12 +0200)]
fix vdpau vc1 interlace modes

7 years agoavcodec: Set frame.width/height on all exit pathes of ff_get_buffer()
Michael Niedermayer [Sun, 5 May 2013 12:23:16 +0000 (14:23 +0200)]
avcodec: Set frame.width/height on all exit pathes of ff_get_buffer()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/opencl: add opencl public error API
highgod0401 [Sun, 28 Apr 2013 00:47:20 +0000 (08:47 +0800)]
lavu/opencl: add opencl public error API

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y
Michael Niedermayer [Sun, 5 May 2013 11:16:53 +0000 (13:16 +0200)]
avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

Demuxers where the changed code looked less readable where skiped

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomake the ordering of the return type and av_cold consistent
Michael Niedermayer [Sun, 5 May 2013 11:13:00 +0000 (13:13 +0200)]
make the ordering of the return type and av_cold consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 5 May 2013 11:05:38 +0000 (13:05 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Check for getenv

Merged-by: Michael Niedermayer <michaelni@gmx.at>