ffmpeg.git
8 years agoFix "ouput" typo and add a check.
Clément Bœsch [Thu, 26 Jan 2012 22:03:35 +0000 (23:03 +0100)]
Fix "ouput" typo and add a check.

8 years agodirac_yasm: fix linking failure due to %ifndef
Michael Niedermayer [Sat, 28 Jan 2012 08:06:03 +0000 (09:06 +0100)]
dirac_yasm: fix linking failure due to %ifndef

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodevices: Disable v4l to fix compilation until someone
Michael Niedermayer [Sat, 28 Jan 2012 07:43:00 +0000 (08:43 +0100)]
devices: Disable v4l to fix compilation until someone
has time to update it to the new API.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 28 Jan 2012 03:23:26 +0000 (04:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (71 commits)
  movenc: Allow writing to a non-seekable output if using empty moov
  movenc: Support adding isml (smooth streaming live) metadata
  libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
  sunrast: Document the different Sun Raster file format types.
  sunrast: Add a check for experimental type.
  libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
  lavf: remove disabled FF_API_SET_PTS_INFO cruft
  lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
  lavf: remove disabled FF_API_REORDER_PRIVATE cruft
  lavf: remove disabled FF_API_SEEK_PUBLIC cruft
  lavf: remove disabled FF_API_STREAM_COPY cruft
  lavf: remove disabled FF_API_PRELOAD cruft
  lavf: remove disabled FF_API_NEW_STREAM cruft
  lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
  lavf: remove disabled FF_API_MUXRATE cruft
  lavf: remove disabled FF_API_FILESIZE cruft
  lavf: remove disabled FF_API_TIMESTAMP cruft
  lavf: remove disabled FF_API_LOOP_OUTPUT cruft
  lavf: remove disabled FF_API_LOOP_INPUT cruft
  lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
  ...

Conflicts:
doc/APIchanges
libavcodec/8bps.c
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/mjpegbdec.c
libavcodec/options.c
libavcodec/sunrast.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/x86/h264_deblock.asm
libavdevice/libdc1394.c
libavdevice/v4l2.c
libavformat/avformat.h
libavformat/avio.c
libavformat/avio.h
libavformat/aviobuf.c
libavformat/dv.c
libavformat/mov.c
libavformat/utils.c
libavformat/version.h
libavformat/wtv.c
libavutil/Makefile
libavutil/file.c
libswscale/x86/input.asm
libswscale/x86/swscale_mmx.c
libswscale/x86/swscale_template.c
tests/ref/lavf/ffm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegvideoenc: Fail if a buffer size is specified without a max rate.
Michael Niedermayer [Wed, 18 Jan 2012 04:36:23 +0000 (05:36 +0100)]
mpegvideoenc: Fail if a buffer size is specified without a max rate.

This combination makes not much sense.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopngdec: Convert 2/4 bit formats to 8bit.
Michael Niedermayer [Fri, 20 Jan 2012 05:39:43 +0000 (06:39 +0100)]
pngdec: Convert 2/4 bit formats to 8bit.

This way 2 and 4 bit gray, rgb & rgba are supported.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotargadec: Simplify RLE out of packet check.
Michael Niedermayer [Sat, 21 Jan 2012 03:36:06 +0000 (04:36 +0100)]
targadec: Simplify RLE out of packet check.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws/pixfmt/pixdesc: add support for yuva444p
Paul B Mahol [Fri, 27 Jan 2012 00:43:23 +0000 (00:43 +0000)]
sws/pixfmt/pixdesc: add support for yuva444p

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Conflicts:

libavutil/avutil.h
libavutil/pixfmt.h

8 years agomovenc: Allow writing to a non-seekable output if using empty moov
Martin Storsjö [Thu, 19 Jan 2012 09:17:13 +0000 (11:17 +0200)]
movenc: Allow writing to a non-seekable output if using empty moov

In this mode, no seeks will be done except for within moov/moof
fragments, which should fit within the AVIOContext buffer.

This allows pushing live smooth streaming format data to
a live publishing point on IIS over http.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agomovenc: Support adding isml (smooth streaming live) metadata
Martin Storsjö [Fri, 20 Jan 2012 11:02:18 +0000 (13:02 +0200)]
movenc: Support adding isml (smooth streaming live) metadata

This metadata is required for pushing a live stream to an IIS
publishing point.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
Martin Storsjö [Thu, 26 Jan 2012 19:37:38 +0000 (21:37 +0200)]
libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set

Earlier, calling avcodec_encode_audio worked fine even if time_base
wasn't set. Now it crashes due to trying to scale the output pts to
the codec context time base. This affects e.g. VLC.

If no time_base is set for audio codecs, set it to the sample
rate.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agosunrast: Document the different Sun Raster file format types.
Aneesh Dogra [Fri, 27 Jan 2012 18:15:58 +0000 (23:45 +0530)]
sunrast: Document the different Sun Raster file format types.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agosunrast: Add a check for experimental type.
Aneesh Dogra [Thu, 26 Jan 2012 18:41:07 +0000 (00:11 +0530)]
sunrast: Add a check for experimental type.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agolibspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
Justin Ruggles [Fri, 27 Jan 2012 16:28:21 +0000 (11:28 -0500)]
libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat

Fixes build with --enable-libspeex

8 years agolavf: remove disabled FF_API_SET_PTS_INFO cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_SET_PTS_INFO cruft

8 years agolavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft

8 years agolavf: remove disabled FF_API_REORDER_PRIVATE cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_REORDER_PRIVATE cruft

8 years agolavf: remove disabled FF_API_SEEK_PUBLIC cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_SEEK_PUBLIC cruft

8 years agolavf: remove disabled FF_API_STREAM_COPY cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_STREAM_COPY cruft

8 years agolavf: remove disabled FF_API_PRELOAD cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_PRELOAD cruft

8 years agolavf: remove disabled FF_API_NEW_STREAM cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_NEW_STREAM cruft

8 years agolavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft

8 years agolavf: remove disabled FF_API_MUXRATE cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_MUXRATE cruft

8 years agolavf: remove disabled FF_API_FILESIZE cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_FILESIZE cruft

8 years agolavf: remove disabled FF_API_TIMESTAMP cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_TIMESTAMP cruft

8 years agolavf: remove disabled FF_API_LOOP_OUTPUT cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_LOOP_OUTPUT cruft

8 years agolavf: remove disabled FF_API_LOOP_INPUT cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_LOOP_INPUT cruft

8 years agolavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft

8 years agolavf: remove disabled FF_API_FLAG_RTP_HINT cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_FLAG_RTP_HINT cruft

8 years agolavf: remove disabled FF_API_SDP_CREATE cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_SDP_CREATE cruft

8 years agolavf: remove disabled FF_API_GUESS_IMG2_CODEC cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_GUESS_IMG2_CODEC cruft

8 years agolavf: remove disabled FF_API_PKT_DUMP cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_PKT_DUMP cruft

8 years agolavf: remove disabled FF_API_FIND_INFO_TAG cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_FIND_INFO_TAG cruft

8 years agolavf: remove disabled FF_API_PARSE_DATE cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_PARSE_DATE cruft

8 years agolavf: remove disabled FF_API_DUMP_FORMAT cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_DUMP_FORMAT cruft

8 years agolavf: remove disabled FF_API_FORMAT_PARAMETERS cruft
Anton Khirnov [Thu, 12 Jan 2012 12:38:58 +0000 (13:38 +0100)]
lavf: remove disabled FF_API_FORMAT_PARAMETERS cruft

Also remove now unused AVFormatParameters struct and
AVOutputFormat.set_parameters().

8 years agolavf: remove disabled FF_API_OLD_METADATA2 cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_OLD_METADATA2 cruft

8 years agolavf: remove disabled FF_API_OLD_AVIO cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_OLD_AVIO cruft

8 years agolavf: increase major version from 53 to 54.
Anton Khirnov [Thu, 12 Jan 2012 10:21:02 +0000 (11:21 +0100)]
lavf: increase major version from 53 to 54.

8 years agolavf: remove AVFormatParameters from AVFormatContext.read_header signature
Anton Khirnov [Thu, 12 Jan 2012 12:20:36 +0000 (13:20 +0100)]
lavf: remove AVFormatParameters from AVFormatContext.read_header signature

8 years agolavc: remove disabled FF_API_AVFRAME_AGE cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_AVFRAME_AGE cruft.

8 years agolavc: remove disabled FF_API_DATA_POINTERS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_DATA_POINTERS cruft.

8 years agolavc: remove disabled FF_API_TIFFENC_COMPLEVEL cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_TIFFENC_COMPLEVEL cruft.

8 years agolavc: remove disabled FF_API_INTERNAL_CONTEXT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_INTERNAL_CONTEXT cruft.

8 years agolavc: remove disabled FF_API_PARSE_FRAME cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_PARSE_FRAME cruft.

8 years agolavc: remove disabled FF_API_GET_ALPHA_INFO cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_GET_ALPHA_INFO cruft.

8 years agolavc: remove disabled FF_API_MJPEG_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_MJPEG_GLOBAL_OPTS cruft.

8 years agolavc: remove disabled FF_API_SNOW_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_SNOW_GLOBAL_OPTS cruft.

8 years agolavc: remove disabled FF_API_LAME_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_LAME_GLOBAL_OPTS cruft.

8 years agolavc: remove disabled FF_API_AVCODEC_INIT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_AVCODEC_INIT cruft.

8 years agolavc: remove disabled FF_API_ER cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_ER cruft.

8 years agolavc: remove disabled FF_API_DRC_SCALE cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_DRC_SCALE cruft.

8 years agolavc: remove disabled FF_API_AVCODEC_OPEN cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_AVCODEC_OPEN cruft.

8 years agolavc: remove disabled FF_API_ALLOC_CONTEXT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_ALLOC_CONTEXT cruft.

8 years agolavc: remove disabled FF_API_GET_PIX_FMT_NAME cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_GET_PIX_FMT_NAME cruft.

8 years agolavc: remove disabled FF_API_FLAC_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_FLAC_GLOBAL_OPTS cruft.

8 years agolavc: remove disabled FF_API_OLD_FF_PICT_TYPES cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_OLD_FF_PICT_TYPES cruft.

8 years agolavc: remove disabled FF_API_THREAD_INIT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_THREAD_INIT cruft.

8 years agolavc: remove disabled FF_API_ANTIALIAS_ALGO cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_ANTIALIAS_ALGO cruft.

8 years agolavc: remove disabled FF_API_OLD_AUDIOCONVERT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_OLD_AUDIOCONVERT cruft.

8 years agolavc: remove disabled FF_API_OLD_SAMPLE_FMT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_OLD_SAMPLE_FMT cruft.

8 years agolavc: remove disabled FF_API_PALETTE_CONTROL cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_PALETTE_CONTROL cruft.

8 years agolavc: remove disabled FF_API_MPEGVIDEO_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_MPEGVIDEO_GLOBAL_OPTS cruft.

8 years agolavc: remove disabled FF_API_X264_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_X264_GLOBAL_OPTS cruft.

8 years agolavc: remove the deprecated opt.h header.
Anton Khirnov [Sun, 22 Jan 2012 09:48:52 +0000 (10:48 +0100)]
lavc: remove the deprecated opt.h header.

8 years agolavc: remove the deprecated "ab" option.
Anton Khirnov [Sun, 22 Jan 2012 09:47:48 +0000 (10:47 +0100)]
lavc: remove the deprecated "ab" option.

8 years agocodec-regression: use private options instead of deprecated codec flags.
Anton Khirnov [Sun, 22 Jan 2012 11:49:31 +0000 (12:49 +0100)]
codec-regression: use private options instead of deprecated codec flags.

8 years agolavc: increase major version to 54.
Anton Khirnov [Thu, 12 Jan 2012 10:17:23 +0000 (11:17 +0100)]
lavc: increase major version to 54.

The lavf-ffm test results change because ffmenc writes
AVCodecContext.flags/flags2 and the defaults for those change.

8 years agocmdutils: fix options starting with 'no'.
Alexandra Khirnova [Fri, 27 Jan 2012 08:59:00 +0000 (08:59 +0000)]
cmdutils: fix options starting with 'no'.

E.g. non_linear_quant mpeg2video private option.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agox86inc.asm: fix typo.
Ronald S. Bultje [Fri, 27 Jan 2012 02:50:12 +0000 (10:50 +0800)]
x86inc.asm: fix typo.

Assemblers don't understand ! in %if statements.

8 years agoswscale: convert rgb/bgr24ToY/UV_mmx functions from inline asm to yasm.
Ronald S. Bultje [Fri, 27 Jan 2012 02:52:55 +0000 (10:52 +0800)]
swscale: convert rgb/bgr24ToY/UV_mmx functions from inline asm to yasm.

Also implement sse2/ssse3/avx versions.

8 years agoconfig.asm: change %ifdef directives to %if directives.
Ronald S. Bultje [Mon, 23 Jan 2012 09:45:58 +0000 (17:45 +0800)]
config.asm: change %ifdef directives to %if directives.

This allows combining multiple conditionals in a single statement.

8 years agoRevert "sws/pixfmt/pixdesc: add support for yuva444p"
Alex Converse [Fri, 27 Jan 2012 02:06:57 +0000 (18:06 -0800)]
Revert "sws/pixfmt/pixdesc: add support for yuva444p"

This reverts commit fc115c80b7bf6f1f5a937ee7f6e14630d99eb4dd.

Tests are broken.

8 years agofrwu: check if allocation was successful
Paul B Mahol [Fri, 27 Jan 2012 01:13:48 +0000 (01:13 +0000)]
frwu: check if allocation was successful

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agovc1dec.c: Don't use uninitialized values of dmv_[x, y]
Mashiat Sarker Shakkhar [Thu, 26 Jan 2012 23:53:24 +0000 (15:53 -0800)]
vc1dec.c: Don't use uninitialized values of dmv_[x, y]

MVDATA may or may not be transmitted. If it is not, both
dmv_x and dmv_y is to be assumed zero.

This may not trigger wrong picture in all systems, but
it's a bug nevertheless. Fixes SA10116.vc1 on my 64-bit
Windows 7.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agosws/pixfmt/pixdesc: add support for yuva444p
Paul B Mahol [Fri, 27 Jan 2012 00:43:23 +0000 (00:43 +0000)]
sws/pixfmt/pixdesc: add support for yuva444p

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoMerge remote-tracking branch 'qatar/master' n0.11-dev
Michael Niedermayer [Fri, 27 Jan 2012 00:42:53 +0000 (01:42 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  smacker: Sanity check huffman tables found in the headers.
  smacker: remove dead store
  qdm2: Check data block size for bytes to bits overflow.
  mxfdec: Fix files with essence containers larger than 2 GiB.
  mxfdec: Employ correct printf conversion specifiers for POSIX int types.
  vc1: always read the bfraction element for interlaced fields
  fate: add XWD image regression test
  lavf: prevent infinite loops while flushing in avformat_find_stream_info
  matroskadec: Pad AAC extradata.
  ismindex: Fix build on mingw

Conflicts:
libavformat/mxfdec.c
libavformat/utils.c
tests/lavf-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomjpegbdec: Fix overflow in SOS.
Alex Converse [Wed, 25 Jan 2012 21:39:24 +0000 (13:39 -0800)]
mjpegbdec: Fix overflow in SOS.

Based in part by a fix from Michael Niedermayer <michaelni@gmx.at>

Fixes CVE-2011-3947

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
8 years agolibavutil: Remove pointless file test program.
Diego Biurrun [Wed, 25 Jan 2012 19:13:17 +0000 (20:13 +0100)]
libavutil: Remove pointless file test program.

8 years ago8bps: K&R formatting cosmetics
Paul B Mahol [Thu, 26 Jan 2012 19:21:15 +0000 (19:21 +0000)]
8bps: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoqdm2: Check data block size for bytes to bits overflow.
Alex Converse [Wed, 25 Jan 2012 23:27:11 +0000 (15:27 -0800)]
qdm2: Check data block size for bytes to bits overflow.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit dac56d9ce01eb9963f28f26b97a81db5cbd46c1c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoismindex: Fix build on mingw
Martin Storsjö [Wed, 25 Jan 2012 11:47:38 +0000 (13:47 +0200)]
ismindex: Fix build on mingw

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 8801fac365549a43a639e239faba409d8f91ef86)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoChangelog: remove duplicate lines
Michael Niedermayer [Thu, 26 Jan 2012 21:16:47 +0000 (22:16 +0100)]
Changelog: remove duplicate lines

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRELEASE_NOTES: update for 0.10
Michael Niedermayer [Thu, 26 Jan 2012 20:57:50 +0000 (21:57 +0100)]
RELEASE_NOTES: update for 0.10

remove minor things and things that we had in many previous releases
already.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoChangelog: update for 0.10
Michael Niedermayer [Thu, 26 Jan 2012 20:33:51 +0000 (21:33 +0100)]
Changelog: update for 0.10

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodv: Fix out of array read
Michael Niedermayer [Wed, 25 Jan 2012 03:51:06 +0000 (04:51 +0100)]
dv: Fix out of array read

Fixes part of CVE-2011-3936

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomov: Fix seeking regression in fragemnted movs.
Michael Niedermayer [Thu, 26 Jan 2012 04:18:01 +0000 (05:18 +0100)]
mov: Fix seeking regression in fragemnted movs.

Regression introduced in 550f7c43ece1af27604407647d10e74b52e6fedf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosnowenc: dont crash with gray but exit with an error msg.
Michael Niedermayer [Thu, 26 Jan 2012 18:41:59 +0000 (19:41 +0100)]
snowenc: dont crash with gray but exit with an error msg.

Fixes Ticket839

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264_sei: Fix infinite loop.
Michael Niedermayer [Thu, 26 Jan 2012 18:31:01 +0000 (19:31 +0100)]
h264_sei: Fix infinite loop.

Fixes not yet fixed parts of CVE-2011-3946.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: fix -qscale X breaking audio codecs
Michael Niedermayer [Thu, 26 Jan 2012 17:49:53 +0000 (18:49 +0100)]
ffmpeg: fix -qscale X breaking audio codecs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosmacker: Sanity check huffman tables found in the headers.
Alex Converse [Thu, 26 Jan 2012 00:12:42 +0000 (16:12 -0800)]
smacker: Sanity check huffman tables found in the headers.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agosmacker: remove dead store
Alex Converse [Thu, 26 Jan 2012 00:22:05 +0000 (16:22 -0800)]
smacker: remove dead store

8 years agoqdm2: Check data block size for bytes to bits overflow.
Alex Converse [Wed, 25 Jan 2012 23:27:11 +0000 (15:27 -0800)]
qdm2: Check data block size for bytes to bits overflow.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agompeg1videoenc: disable slice threads
Michael Niedermayer [Thu, 26 Jan 2012 17:45:46 +0000 (18:45 +0100)]
mpeg1videoenc: disable slice threads

It doesnt work (and as far as i tested also didnt in the past)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agokvmc: Check palsize.
Michael Niedermayer [Thu, 26 Jan 2012 16:30:49 +0000 (17:30 +0100)]
kvmc: Check palsize.

Fixes: CVE-2011-3952

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomatroskadec: increase padding on several more extradata allocations.
Michael Niedermayer [Thu, 26 Jan 2012 16:22:34 +0000 (17:22 +0100)]
matroskadec: increase padding on several more extradata allocations.

Inspired by: 5af569aa30b93f56344ea540936eb671760f568c by alex
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomatroskadec: Pad AAC extradata.
Alex Converse [Wed, 25 Jan 2012 22:34:21 +0000 (14:34 -0800)]
matroskadec: Pad AAC extradata.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit d2ee8c17793201ce969afd1f433ba1580c143cd2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodpcm: Round output buffer size up.
Michael Niedermayer [Thu, 26 Jan 2012 16:04:51 +0000 (17:04 +0100)]
dpcm: Round output buffer size up.

Fixes: CVE-2011-3951

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodiracdec: Check num_refs.
Michael Niedermayer [Thu, 26 Jan 2012 15:51:01 +0000 (16:51 +0100)]
diracdec: Check num_refs.

Fixes: CVE-2011-3950

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodiracdec: Check dirac_unpack_idwt_params parameters before storing them.
Michael Niedermayer [Thu, 26 Jan 2012 14:41:43 +0000 (15:41 +0100)]
diracdec: Check dirac_unpack_idwt_params parameters before storing them.

Fixes CVE-2011-3949

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>