ffmpeg.git
6 years agoframemd5_class and md5enc_class may not be identical.
Reimar Döffinger [Fri, 24 May 2013 12:24:46 +0000 (14:24 +0200)]
framemd5_class and md5enc_class may not be identical.

Due the crappy issue of classes having to be unique,
we cannot even have classes with identical content,
otherwise the compiler or linker is free to merge them,
giving the same result and bugs as if we had only one class.
Besides redesigning the option code to handle this correctly
I see only the option of requiring any two classes to have
different names, but the list of requirements for
AVClasses is getting kind of unmanageable.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoFix compilation with --disable-everything --enable-filter=dctdnoiz
Carl Eugen Hoyos [Fri, 24 May 2013 13:52:57 +0000 (15:52 +0200)]
Fix compilation with --disable-everything --enable-filter=dctdnoiz

6 years agoFix compilation with --disable-everything --enable-muxer=vc1
Thilo Borgmann [Fri, 24 May 2013 14:00:18 +0000 (16:00 +0200)]
Fix compilation with --disable-everything --enable-muxer=vc1

Suggested-by: Reimar
6 years agolavfi/blend: add yuv(j)411p
Paul B Mahol [Fri, 24 May 2013 14:01:14 +0000 (14:01 +0000)]
lavfi/blend: add yuv(j)411p

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agovformat/wtvenc: fix doxygen comments
Michael Niedermayer [Thu, 23 May 2013 13:52:33 +0000 (15:52 +0200)]
vformat/wtvenc: fix doxygen comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/wtvdec: fix doxygen comments
Michael Niedermayer [Thu, 23 May 2013 13:52:07 +0000 (15:52 +0200)]
avformat/wtvdec: fix doxygen comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/jvdec: fix doxygen comments
Michael Niedermayer [Thu, 23 May 2013 13:51:43 +0000 (15:51 +0200)]
avformat/jvdec: fix doxygen comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/gif: remove unneeded doxygen comment
Michael Niedermayer [Thu, 23 May 2013 13:51:11 +0000 (15:51 +0200)]
avformat/gif: remove unneeded doxygen comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_drawtext: Fix doxygen comment
Michael Niedermayer [Thu, 23 May 2013 13:50:39 +0000 (15:50 +0200)]
avfilter/vf_drawtext: Fix doxygen comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/bprint: Fix doxygen comments
Michael Niedermayer [Thu, 23 May 2013 13:47:32 +0000 (15:47 +0200)]
avutil/bprint: Fix doxygen comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: print slice threading flag in -filters.
Clément Bœsch [Fri, 24 May 2013 13:15:49 +0000 (15:15 +0200)]
cmdutils: print slice threading flag in -filters.

6 years agoavfilter: remove av_opt_set_defaults() from process_options()
Michael Niedermayer [Fri, 24 May 2013 13:06:53 +0000 (15:06 +0200)]
avfilter: remove av_opt_set_defaults() from process_options()

This is already called from ff_filter_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 24 May 2013 12:38:29 +0000 (14:38 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_fade: support slice threading
  vf_yadif: support slice threading

Conflicts:
libavfilter/vf_fade.c
libavfilter/vf_yadif.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/field, il, noise: use av_pix_fmt_count_planes()
Paul B Mahol [Fri, 24 May 2013 12:53:23 +0000 (12:53 +0000)]
lavfi/field, il, noise: use av_pix_fmt_count_planes()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'
Michael Niedermayer [Fri, 24 May 2013 11:47:45 +0000 (13:47 +0200)]
Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'

* commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f':
  lavfi: add a slice threading infrastructure

Conflicts:
Changelog
cmdutils.c
doc/APIchanges
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675'
Michael Niedermayer [Fri, 24 May 2013 11:13:03 +0000 (13:13 +0200)]
Merge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675'

* commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675':
  Move get_logical_cpus() from lavc/pthread to lavu/cpu.

Conflicts:
doc/APIchanges
libavcodec/pthread.c
libavutil/cpu.c
libavutil/cpu.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'
Michael Niedermayer [Fri, 24 May 2013 10:32:18 +0000 (12:32 +0200)]
Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'

* commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d':
  w32pthreads: move from lavc to compat/

Conflicts:
libavcodec/Makefile
libavcodec/pthread.c
libavcodec/vp8.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e69222c50755030eef921e899e38b71a111093d9'
Michael Niedermayer [Fri, 24 May 2013 10:24:53 +0000 (12:24 +0200)]
Merge commit 'e69222c50755030eef921e899e38b71a111093d9'

* commit 'e69222c50755030eef921e899e38b71a111093d9':
  doxy: enable TYPEDEF_HIDES_STRUCT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68'
Michael Niedermayer [Fri, 24 May 2013 10:04:18 +0000 (12:04 +0200)]
Merge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68'

* commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68':
  Monkey's Audio old versions FATE tests
  h264_parser: Set field_order and picture_structure.

Conflicts:
libavcodec/h264_parser.c
tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/opencl: remove semi-colon from macro.
Clément Bœsch [Fri, 24 May 2013 09:10:22 +0000 (11:10 +0200)]
lavu/opencl: remove semi-colon from macro.

Fixes compilation when the macros are empty and the label above ends up
containing no statement. Also makes usage of these macro consistent
(some already have a semi colon, some others don't).

Fixes Ticket #2603

6 years agoMerge commit 'b493847df4ff8ce46f258749e4a3f304696b34c1'
Michael Niedermayer [Fri, 24 May 2013 09:51:58 +0000 (11:51 +0200)]
Merge commit 'b493847df4ff8ce46f258749e4a3f304696b34c1'

* commit 'b493847df4ff8ce46f258749e4a3f304696b34c1':
  avcodec: Add picture structure information to AVCodecParserContext.

Conflicts:
doc/APIchanges
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_fade: support slice threading
Anton Khirnov [Sat, 11 May 2013 19:40:28 +0000 (21:40 +0200)]
vf_fade: support slice threading

6 years agovf_yadif: support slice threading
Anton Khirnov [Sat, 11 May 2013 19:40:28 +0000 (21:40 +0200)]
vf_yadif: support slice threading

6 years agolavfi: add a slice threading infrastructure
Anton Khirnov [Sat, 11 May 2013 18:41:46 +0000 (20:41 +0200)]
lavfi: add a slice threading infrastructure

Mostly based on libavcodec's

6 years agoMove get_logical_cpus() from lavc/pthread to lavu/cpu.
Anton Khirnov [Thu, 23 May 2013 06:59:07 +0000 (08:59 +0200)]
Move get_logical_cpus() from lavc/pthread to lavu/cpu.

It will be useful in lavfi, and could conceivably be useful to the user
applications as well.

6 years agow32pthreads: move from lavc to compat/
Anton Khirnov [Sun, 12 May 2013 06:11:42 +0000 (08:11 +0200)]
w32pthreads: move from lavc to compat/

It will be used in other places than lavc.

6 years agodoxy: enable TYPEDEF_HIDES_STRUCT
Anton Khirnov [Sun, 12 May 2013 12:58:14 +0000 (14:58 +0200)]
doxy: enable TYPEDEF_HIDES_STRUCT

This means that typedef struct SomeStruct {...} SomeStruct will only be
documented as SomeStruct in the doxy, without a pointless entry in the
typedefs list.

6 years agoMonkey's Audio old versions FATE tests
Kostya Shishkov [Fri, 3 May 2013 08:13:00 +0000 (10:13 +0200)]
Monkey's Audio old versions FATE tests

6 years agoh264_parser: Set field_order and picture_structure.
Yusuke Nakamura [Tue, 14 May 2013 22:37:36 +0000 (07:37 +0900)]
h264_parser: Set field_order and picture_structure.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoavcodec: Add picture structure information to AVCodecParserContext.
Yusuke Nakamura [Tue, 14 May 2013 22:36:15 +0000 (07:36 +0900)]
avcodec: Add picture structure information to AVCodecParserContext.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoChangelog: add entry for the S302m encoder
Michael Niedermayer [Fri, 24 May 2013 02:20:54 +0000 (04:20 +0200)]
Changelog: add entry for the S302m encoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agos302menc: unbreak compilation
Paul B Mahol [Thu, 23 May 2013 20:38:53 +0000 (20:38 +0000)]
s302menc: unbreak compilation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agos302menc: fix bits_per_raw_sample for 21, 22 & 23 case
Paul B Mahol [Thu, 23 May 2013 20:34:07 +0000 (20:34 +0000)]
s302menc: fix bits_per_raw_sample for 21, 22 & 23 case

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavc/codec_desc: SMPTE 302M is not lossy
Paul B Mahol [Thu, 23 May 2013 20:25:19 +0000 (20:25 +0000)]
lavc/codec_desc: SMPTE 302M is not lossy

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoescape124: switch to init_get_bits8()
Paul B Mahol [Thu, 23 May 2013 19:56:43 +0000 (19:56 +0000)]
escape124: switch to init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoescape124: pass context to av_log()
Paul B Mahol [Thu, 23 May 2013 19:53:08 +0000 (19:53 +0000)]
escape124: pass context to av_log()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolibaacplus: return meaningful error codes
Paul B Mahol [Thu, 23 May 2013 19:40:15 +0000 (19:40 +0000)]
libaacplus: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolibaacplus: cosmetics: fix indentation
Paul B Mahol [Thu, 23 May 2013 19:37:52 +0000 (19:37 +0000)]
libaacplus: cosmetics: fix indentation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolibaacplus: move profile check above, simplifies code a little
Paul B Mahol [Thu, 23 May 2013 19:34:39 +0000 (19:34 +0000)]
libaacplus: move profile check above, simplifies code a little

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotools/patcheck: fix misdetection with stuff like const_names
Michael Niedermayer [Thu, 23 May 2013 14:00:10 +0000 (16:00 +0200)]
tools/patcheck: fix misdetection with stuff like const_names

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/filters: fix wording of color option in testsrc filters.
Clément Bœsch [Thu, 23 May 2013 12:01:51 +0000 (14:01 +0200)]
doc/filters: fix wording of color option in testsrc filters.

6 years agolavfi/testsrc: make nb_decimals available only in testsrc.
Clément Bœsch [Thu, 23 May 2013 11:56:08 +0000 (13:56 +0200)]
lavfi/testsrc: make nb_decimals available only in testsrc.

6 years agolavfi/testsrc: move color options to the color scope filter definition.
Clément Bœsch [Thu, 23 May 2013 11:54:08 +0000 (13:54 +0200)]
lavfi/testsrc: move color options to the color scope filter definition.

6 years agoavcodec/libfaac: fallback to a supported bitrate if the requested is not supported
Michael Niedermayer [Wed, 22 May 2013 13:12:36 +0000 (15:12 +0200)]
avcodec/libfaac: fallback to a supported bitrate if the requested is not supported

Fixes: Ticket2587

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mtv: remove empty comments
Michael Niedermayer [Thu, 23 May 2013 12:46:01 +0000 (14:46 +0200)]
avformat/mtv: remove empty comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegvideo: remove empty comments
Michael Niedermayer [Thu, 23 May 2013 12:43:42 +0000 (14:43 +0200)]
avcodec/mpegvideo: remove empty comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopostproc/postprocess_template: remove empty comments
Michael Niedermayer [Thu, 23 May 2013 12:39:58 +0000 (14:39 +0200)]
postproc/postprocess_template: remove empty comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agos302m encoder
Darryl Wallace [Fri, 15 Mar 2013 04:37:07 +0000 (00:37 -0400)]
s302m encoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoescape130: switch to init_get_bits8()
Paul B Mahol [Thu, 23 May 2013 10:21:12 +0000 (10:21 +0000)]
escape130: switch to init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/wavpack: remove ;;
Michael Niedermayer [Thu, 23 May 2013 09:05:37 +0000 (11:05 +0200)]
avcodec/wavpack: remove ;;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofraps: set avctx->color_range
Paul B Mahol [Thu, 23 May 2013 10:05:28 +0000 (10:05 +0000)]
fraps: set avctx->color_range

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodoc/general: remove obsolete info about APE decoder
Paul B Mahol [Thu, 23 May 2013 09:32:12 +0000 (09:32 +0000)]
doc/general: remove obsolete info about APE decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 23 May 2013 08:55:00 +0000 (10:55 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wavpack: check packet size early

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62'
Michael Niedermayer [Thu, 23 May 2013 08:46:05 +0000 (10:46 +0200)]
Merge commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62'

* commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62':
  wavpack: use bytestream2 in wavpack_decode_block

Conflicts:
libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f36d7831d96aeb072db5a2b78892a534d96e288e'
Michael Niedermayer [Thu, 23 May 2013 08:33:45 +0000 (10:33 +0200)]
Merge commit 'f36d7831d96aeb072db5a2b78892a534d96e288e'

* commit 'f36d7831d96aeb072db5a2b78892a534d96e288e':
  pixdesc: mark gray8 as pseudopal

Conflicts:
libavutil/pixdesc.c

No change as gray8 was already marked as pseudopal in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3eae9b030cbbdc263f69834b791624613032d548'
Michael Niedermayer [Thu, 23 May 2013 08:24:15 +0000 (10:24 +0200)]
Merge commit '3eae9b030cbbdc263f69834b791624613032d548'

* commit '3eae9b030cbbdc263f69834b791624613032d548':
  mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: Keep internal and external av_read_frame() packets in sync.
Dale Curtis [Wed, 22 May 2013 22:17:08 +0000 (15:17 -0700)]
avformat/utils: Keep internal and external av_read_frame() packets in sync.

Otherwise, during error conditions, the caller will be left with
dangling pointers to a destructed packet => boom.

BUG=242786
TEST=ffmpeg_regression_tests

Commit slightly simplified by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/mp: try to pass interlaced & tff flags
Paul B Mahol [Wed, 22 May 2013 20:25:54 +0000 (20:25 +0000)]
lavfi/mp: try to pass interlaced & tff flags

This makes mp=softpulldown actually useful.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/lut3d: avoid overread.
Clément Bœsch [Wed, 22 May 2013 20:12:14 +0000 (22:12 +0200)]
lavfi/lut3d: avoid overread.

6 years agowavpack: check packet size early
Luca Barbato [Wed, 22 May 2013 10:51:42 +0000 (12:51 +0200)]
wavpack: check packet size early

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agowavpack: use bytestream2 in wavpack_decode_block
Luca Barbato [Wed, 22 May 2013 10:27:04 +0000 (12:27 +0200)]
wavpack: use bytestream2 in wavpack_decode_block

Prevent most out of buffer reads.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agoavcodec/aic: Fix vlc value checks
Michael Niedermayer [Wed, 22 May 2013 19:29:45 +0000 (21:29 +0200)]
avcodec/aic: Fix vlc value checks

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopixdesc: mark gray8 as pseudopal
Anton Khirnov [Sat, 4 May 2013 11:57:32 +0000 (13:57 +0200)]
pixdesc: mark gray8 as pseudopal

Many functions treat it as such already.
Fixes Bug 499.

CC:libav-stable@libav.org

6 years agoproresdec: Fix end condition
Michael Niedermayer [Wed, 22 May 2013 17:44:12 +0000 (19:44 +0200)]
proresdec: Fix end condition

Fixes out of array writes
No FFmpeg release is affected by this

This also fixes some artifacts

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosmvjpegdec: use av_pix_fmt_desc_get() avoid direct table access
Michael Niedermayer [Wed, 22 May 2013 16:23:57 +0000 (18:23 +0200)]
smvjpegdec: use av_pix_fmt_desc_get() avoid direct table access

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agov4l2: make possible to disable libv4l2 at runtime.
Clément Bœsch [Mon, 20 May 2013 13:43:31 +0000 (15:43 +0200)]
v4l2: make possible to disable libv4l2 at runtime.

Also disable it by default since it looks currently buggy. The
usefulness of such library is mostly limited to backward compatibility
with very old devices.

6 years agolavfi: add lut3d filter.
Clément Bœsch [Tue, 7 May 2013 12:48:56 +0000 (14:48 +0200)]
lavfi: add lut3d filter.

Fixes part of Ticket #2517.

6 years agoshorten: fix "off by padding" bug
Michael Niedermayer [Wed, 22 May 2013 15:39:22 +0000 (17:39 +0200)]
shorten: fix "off by padding" bug

Fixes array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes
Janne Grunau [Tue, 21 May 2013 15:39:27 +0000 (17:39 +0200)]
mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes

ff_mpeg_unref_picture clears the flag indicating that the frame needs to
be reallocated after a frame size change. Since we have now reference
counted buffers we can unref the buffers immediately.

6 years agoSupport playing SMV files.
Ash Hughes [Wed, 22 May 2013 01:16:51 +0000 (01:16 +0000)]
Support playing SMV files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavienc: Disallow the first frame to be skiped
Michael Niedermayer [Mon, 20 May 2013 16:58:39 +0000 (18:58 +0200)]
avienc: Disallow the first frame to be skiped

Fixes Ticket2386

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

* qatar/master:
  configure: Enable the strtod workaround when building for bionic

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Wed, 22 May 2013 02:27:07 +0000 (04:27 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add a fate test for ProRes Transparency.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec & jpeg2000dec: check lengthinc against array size
Michael Niedermayer [Wed, 22 May 2013 02:05:36 +0000 (04:05 +0200)]
j2kdec & jpeg2000dec: check lengthinc against array size

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k & jpeg2000dec: reset numX/Ytiles if tiles failed allocation
Michael Niedermayer [Wed, 22 May 2013 01:17:35 +0000 (03:17 +0200)]
j2k & jpeg2000dec: reset numX/Ytiles if tiles failed allocation

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/jpeg2000dec: Port tile size check from j2kdec
Michael Niedermayer [Wed, 22 May 2013 01:12:44 +0000 (03:12 +0200)]
avcodec/jpeg2000dec: Port tile size check from j2kdec

Fixes potential integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: check TPsot
Michael Niedermayer [Wed, 22 May 2013 00:31:03 +0000 (02:31 +0200)]
jpeg2000dec: check TPsot

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: read and check curtileno
Michael Niedermayer [Wed, 22 May 2013 00:29:00 +0000 (02:29 +0200)]
jpeg2000dec: read and check curtileno

Fixes out of array accesses
Code ported from j2kdec

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec & j2kdec: Fix return type of get_sot()
Michael Niedermayer [Wed, 22 May 2013 00:13:22 +0000 (02:13 +0200)]
jpeg2000dec & j2kdec: Fix return type of get_sot()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovcodec/jpeg2000dec: fix av_log() type
Michael Niedermayer [Wed, 22 May 2013 00:05:50 +0000 (02:05 +0200)]
vcodec/jpeg2000dec: fix av_log() type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: cosmetics from jpeg2000dec
Michael Niedermayer [Tue, 21 May 2013 23:25:52 +0000 (01:25 +0200)]
j2kdec: cosmetics from jpeg2000dec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/jpeg2000dec: merge bytestream2 reading from j2kdec
Michael Niedermayer [Tue, 21 May 2013 23:23:56 +0000 (01:23 +0200)]
avcodec/jpeg2000dec: merge bytestream2 reading from j2kdec

This fixes at least one out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/jpeg2000dec: get_qcx, fix stack and heap overwrites
Michael Niedermayer [Tue, 21 May 2013 21:38:26 +0000 (23:38 +0200)]
avcodec/jpeg2000dec: get_qcx, fix stack and heap overwrites

This is likely remotely exploitable
Fix ported from j2kdec
No uptodate FFmpeg release should be affected by this

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd a fate test for ProRes Transparency.
Carl Eugen Hoyos [Tue, 21 May 2013 21:09:19 +0000 (23:09 +0200)]
Add a fate test for ProRes Transparency.

6 years agolavu/opt: check if class is NULL too
Paul B Mahol [Tue, 21 May 2013 20:48:42 +0000 (20:48 +0000)]
lavu/opt: check if class is NULL too

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/(a)showinfo: use link frame counter instead of local counter.
Clément Bœsch [Tue, 21 May 2013 20:27:07 +0000 (22:27 +0200)]
lavfi/(a)showinfo: use link frame counter instead of local counter.

6 years agoavutil/pixfmt: add forgotten deprecated to YUVJ411
Michael Niedermayer [Tue, 21 May 2013 19:49:28 +0000 (21:49 +0200)]
avutil/pixfmt: add forgotten deprecated to YUVJ411

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: Check ncomponents and tile dimensions
Michael Niedermayer [Tue, 21 May 2013 19:36:32 +0000 (21:36 +0200)]
jpeg2000dec: Check ncomponents and tile dimensions

Fixes various problems

Code ported from j2kdec

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/j2k: rename J2K_ constants to JPEG2000_
Michael Niedermayer [Tue, 21 May 2013 19:27:56 +0000 (21:27 +0200)]
avcodec/j2k: rename J2K_ constants to JPEG2000_

This should simplify merging the 2 decoders

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: Rename structs to be more similar to jpeg2000dec
Michael Niedermayer [Tue, 21 May 2013 19:19:05 +0000 (21:19 +0200)]
j2k: Rename structs to be more similar to jpeg2000dec

This should simplify merging

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: s/decode_packets/jpeg2000_decode_packets/
Michael Niedermayer [Tue, 21 May 2013 19:14:00 +0000 (21:14 +0200)]
j2kdec: s/decode_packets/jpeg2000_decode_packets/

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/geq: prefer symbolic constants
Stefano Sabatini [Sun, 19 May 2013 21:32:02 +0000 (23:32 +0200)]
lavfi/geq: prefer symbolic constants

Hopefully enhance readability.

6 years agolavfi/geq: add aliases for RGB options
Stefano Sabatini [Sun, 19 May 2013 21:24:21 +0000 (23:24 +0200)]
lavfi/geq: add aliases for RGB options

6 years agovp3: zero allocated tables
Paul B Mahol [Fri, 17 May 2013 12:48:03 +0000 (12:48 +0000)]
vp3: zero allocated tables

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoconfigure: Enable the strtod workaround when building for bionic
Martin Storsjö [Tue, 21 May 2013 08:43:00 +0000 (11:43 +0300)]
configure: Enable the strtod workaround when building for bionic

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoseek-test: make duration user configurable
Michael Niedermayer [Mon, 20 May 2013 02:21:34 +0000 (04:21 +0200)]
seek-test: make duration user configurable

Previously this was hardcoded to 4 seconds

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/yadif: add timeline support.
Clément Bœsch [Tue, 21 May 2013 12:52:34 +0000 (14:52 +0200)]
lavfi/yadif: add timeline support.

6 years agoavcodec/huffman: increase bits constant
Michael Niedermayer [Tue, 21 May 2013 11:40:01 +0000 (13:40 +0200)]
avcodec/huffman: increase bits constant

Fixes Ticket2593

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffman: use named identifer for the bits constant
Michael Niedermayer [Tue, 21 May 2013 11:37:00 +0000 (13:37 +0200)]
avcodec/huffman: use named identifer for the bits constant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/bitstream: print vlc length in error case.
Michael Niedermayer [Tue, 21 May 2013 11:24:40 +0000 (13:24 +0200)]
avcodec/bitstream: print vlc length in error case.

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