]> git.sesse.net Git - ffmpeg/log
ffmpeg
12 years agocook: avoid out of global array read.
Michael Niedermayer [Tue, 28 Feb 2012 19:08:47 +0000 (20:08 +0100)]
cook: avoid out of global array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 28 Feb 2012 23:30:35 +0000 (00:30 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  adpcm: Clip step_index values read from the bitstream at the beginning of each frame.
  oma: don't read beyond end of leaf_table.
  doxygen: Remove documentation for non-existing parameters; misc small fixes.
  Indeo3: fix crashes on corrupt bitstreams.
  msmpeg4: Replace forward declaration by proper #include.
  segment: implement wrap around
  avf: reorder AVStream and AVFormatContext
  aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message.

Conflicts:
libavcodec/indeo3.c
libavformat/avformat.h
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoadpcm_xa: Check filter validity.
Michael Niedermayer [Tue, 28 Feb 2012 21:53:20 +0000 (22:53 +0100)]
adpcm_xa: Check filter validity.

Fixes out of global array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoadpcm: Clip step_index values read from the bitstream at the beginning of each frame.
Alex Converse [Tue, 28 Feb 2012 19:50:22 +0000 (11:50 -0800)]
adpcm: Clip step_index values read from the bitstream at the beginning of each frame.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
12 years agooma: don't read beyond end of leaf_table.
Ronald S. Bultje [Tue, 28 Feb 2012 19:35:36 +0000 (11:35 -0800)]
oma: don't read beyond end of leaf_table.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years agodoxygen: Remove documentation for non-existing parameters; misc small fixes.
Diego Biurrun [Tue, 21 Feb 2012 22:33:01 +0000 (23:33 +0100)]
doxygen: Remove documentation for non-existing parameters; misc small fixes.

12 years agomxfdec: set pixel format for cdci picture formats
Philip de Nier [Tue, 28 Feb 2012 14:16:39 +0000 (14:16 +0000)]
mxfdec: set pixel format for cdci picture formats

The properties of the CDCI Descriptor are insufficient to specify
the pixel format for uncompressed picture data. SMPTE 377-1 and
RP224v10 have defined a set of picture coding labels to indicate what
formatting was used.

This patch uses 2 labels to detect UYVY422 or YUYV422 pixel formats.

It defaults to UYVY422 for 8-bit 4:2:2 pictures to support files
that were created before the coding labels were introduced ~2008

The codec pix_fmt default was changed from 0 (PIX_FMT_YUV420P) to
-1 (PIX_FMT_NONE)

Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomxfdec: detect uncomp pictures using essence container ul
Philip de Nier [Tue, 28 Feb 2012 14:16:38 +0000 (14:16 +0000)]
mxfdec: detect uncomp pictures using essence container ul

This supports detection of uncompressed picture in files that
didn't include a Picture Coding Label. The lables weren't
available until SMPTE 377-1 and RP224v10

Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomxf: add uncompressed 422 8-bit rawvideo label
Philip de Nier [Tue, 28 Feb 2012 14:16:37 +0000 (14:16 +0000)]
mxf: add uncompressed 422 8-bit rawvideo label

Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomxfdec: set track edit rate num/den in expected order
Philip de Nier [Tue, 28 Feb 2012 14:16:36 +0000 (14:16 +0000)]
mxfdec: set track edit rate num/den in expected order

This matches the order used for the index table edit rate.

Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomxf: fix v210 label matching len
Philip de Nier [Tue, 28 Feb 2012 14:16:35 +0000 (14:16 +0000)]
mxf: fix v210 label matching len

Must check all 16 bytes because there is a planar 10-bit format
label that has equal first 15 bytes

Review-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agocook: add const to quant_index_table of categorize()
Michael Niedermayer [Tue, 28 Feb 2012 19:07:26 +0000 (20:07 +0100)]
cook: add const to quant_index_table of categorize()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoIndeo3: fix crashes on corrupt bitstreams.
Ronald S. Bultje [Tue, 28 Feb 2012 18:22:28 +0000 (10:22 -0800)]
Indeo3: fix crashes on corrupt bitstreams.

Splits at borders of cells are invalid, since it leaves one of the
cells with a width/height of zero. Also, propagate errors on buffer
allocation failures, so we don't continue decoding (which crashes).

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years agoomadec: Fix wrong number of array elements.
Michael Niedermayer [Tue, 28 Feb 2012 17:41:44 +0000 (18:41 +0100)]
omadec: Fix wrong number of array elements.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: Fix division by 0 due to invalid timebase
Michael Niedermayer [Tue, 28 Feb 2012 17:41:01 +0000 (18:41 +0100)]
ffmpeg: Fix division by 0 due to invalid timebase

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoadd v210 to intra only list to allow "-vcodec copy"
Philip de Nier [Tue, 28 Feb 2012 14:16:41 +0000 (14:16 +0000)]
add v210 to intra only list to allow "-vcodec copy"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agotests: add libpostproc test
Michael Niedermayer [Tue, 28 Feb 2012 04:18:08 +0000 (05:18 +0100)]
tests: add libpostproc test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomsmpeg4: Replace forward declaration by proper #include.
Diego Biurrun [Sat, 18 Feb 2012 12:43:59 +0000 (13:43 +0100)]
msmpeg4: Replace forward declaration by proper #include.

12 years agosegment: implement wrap around
Luca Barbato [Sat, 25 Feb 2012 20:45:23 +0000 (21:45 +0100)]
segment: implement wrap around

Provide a way to wrap around the segment index so pseudostreaming
live through a web server and html5 browser is simpler.

Also ensure that 0 (disable) is a valid value across the options
providing wrap around.

12 years agoavf: reorder AVStream and AVFormatContext
Luca Barbato [Mon, 27 Feb 2012 21:40:11 +0000 (22:40 +0100)]
avf: reorder AVStream and AVFormatContext

12 years agopmpdec: Check for zero audio packets.
Michael Niedermayer [Tue, 28 Feb 2012 06:19:37 +0000 (07:19 +0100)]
pmpdec: Check for zero audio packets.

This fixes a division by 0.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 28 Feb 2012 02:38:58 +0000 (03:38 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec_default_reget_buffer(): fix compilation in DEBUG mode
  fate: Overhaul WavPack coverage
  h264: fix mmxext chroma deblock to use correct TC values.
  flvdec: Remove the now redundant check for known broken metadata creator
  flvdec: Validate index entries added from metadata while reading
  rtsp: Handle requests from server to client
  movenc: use timestamps instead of frame_size for samples-per-packet
  movenc: use the first cluster duration as the tfhd default duration
  movenc: factorize calculation of cluster duration into a separate function
  doc/APIchanges: fill in missing dates and hashes.
  lavc: reorder AVCodecContext fields.
  lavc: reorder AVFrame fields.

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavformat/flvdec.c
libavformat/movenc.c
tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoaacdec: Remove erroneous reference to global gain from the out of bounds scalefactor...
Alex Converse [Thu, 23 Feb 2012 19:08:47 +0000 (11:08 -0800)]
aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message.

12 years agolibpostproc: add pp=help support to print the help text via av_log()
Michael Niedermayer [Mon, 27 Feb 2012 20:48:18 +0000 (21:48 +0100)]
libpostproc: add pp=help support to print the help text via av_log()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoavcodec_default_reget_buffer(): fix compilation in DEBUG mode
Diego Biurrun [Mon, 27 Feb 2012 19:52:06 +0000 (20:52 +0100)]
avcodec_default_reget_buffer(): fix compilation in DEBUG mode

12 years agoExit ffmpeg if swr_convert() fails.
Carl Eugen Hoyos [Mon, 27 Feb 2012 18:01:53 +0000 (19:01 +0100)]
Exit ffmpeg if swr_convert() fails.

12 years agofate: Overhaul WavPack coverage
Derek Buitenhuis [Fri, 24 Feb 2012 16:41:06 +0000 (11:41 -0500)]
fate: Overhaul WavPack coverage

WavPack has a comprehensive test suite, and a bunch
of corner cases.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 years agoh264: fix mmxext chroma deblock to use correct TC values.
Ronald S. Bultje [Sun, 26 Feb 2012 16:57:14 +0000 (08:57 -0800)]
h264: fix mmxext chroma deblock to use correct TC values.

12 years agofate: add test for the life video source.
Nicolas George [Sat, 25 Feb 2012 13:18:24 +0000 (14:18 +0100)]
fate: add test for the life video source.

12 years agofate: add test for the unsharp video filter.
Nicolas George [Sat, 25 Feb 2012 13:07:14 +0000 (14:07 +0100)]
fate: add test for the unsharp video filter.

12 years agofate: add test for the transpose video filter.
Nicolas George [Sat, 25 Feb 2012 13:03:42 +0000 (14:03 +0100)]
fate: add test for the transpose video filter.

12 years agofate: add test for the thumbnail video filter.
Nicolas George [Sat, 25 Feb 2012 13:00:08 +0000 (14:00 +0100)]
fate: add test for the thumbnail video filter.

12 years agofate: add test for the select video filter.
Nicolas George [Sat, 25 Feb 2012 12:51:24 +0000 (13:51 +0100)]
fate: add test for the select video filter.

12 years agofate: add test for the pad video filter.
Nicolas George [Sat, 25 Feb 2012 12:45:43 +0000 (13:45 +0100)]
fate: add test for the pad video filter.

12 years agofate: add test for the overlay video filter.
Nicolas George [Sat, 25 Feb 2012 12:41:42 +0000 (13:41 +0100)]
fate: add test for the overlay video filter.

The test also covers somewhat the split, scale,
pad and fifo filters and the graph parser.

12 years agofate: add test for the fade video filter.
Nicolas George [Sat, 25 Feb 2012 12:29:17 +0000 (13:29 +0100)]
fate: add test for the fade video filter.

12 years agofate: add test for the drawbox video filter.
Nicolas George [Sat, 25 Feb 2012 12:22:02 +0000 (13:22 +0100)]
fate: add test for the drawbox video filter.

12 years agofate: add test for the deshake video filter.
Nicolas George [Sat, 25 Feb 2012 12:15:27 +0000 (13:15 +0100)]
fate: add test for the deshake video filter.

12 years agofate: add tests for the setsar and setdar video filters.
Nicolas George [Sat, 25 Feb 2012 11:56:59 +0000 (12:56 +0100)]
fate: add tests for the setsar and setdar video filters.

12 years agofate: add tests for testsrc.
Nicolas George [Sat, 25 Feb 2012 11:54:52 +0000 (12:54 +0100)]
fate: add tests for testsrc.

This test uses the lavfi device and
is ready for more similar tests.

12 years agoflvdec: Remove the now redundant check for known broken metadata creator
Michael Niedermayer [Thu, 29 Dec 2011 22:23:34 +0000 (23:23 +0100)]
flvdec: Remove the now redundant check for known broken metadata creator

The index validation identifies these indexes as broken.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoflvdec: Validate index entries added from metadata while reading
Martin Storsjö [Sat, 25 Feb 2012 14:08:06 +0000 (16:08 +0200)]
flvdec: Validate index entries added from metadata while reading

By validating the index entries while reading, we don't need to
seek at startup to validate the entries. If the error in the
index entries is not pointing to (our definition of) the start
of packets, and there is an index entry pointing at some of the
first packets after the metadata, the invalid index can be discarded
almost immediately.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agortsp: Handle requests from server to client
Tommy Winther [Wed, 12 Oct 2011 09:26:45 +0000 (12:26 +0300)]
rtsp: Handle requests from server to client

This returns 200 OK for OPTIONS requests and 501 Not Implemented
for all other requests.

Even though this doesn't do much actual handling of the requests,
it makes the code properly identify server requests as such, instead
of interpreting it as a reply to the client's request as it did
before.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agomovenc: use timestamps instead of frame_size for samples-per-packet
Justin Ruggles [Sun, 26 Feb 2012 21:25:46 +0000 (16:25 -0500)]
movenc: use timestamps instead of frame_size for samples-per-packet

For encoding, AVCodecContext.frame_size is the number of input samples to
send to the encoder and does not necessarily correspond directly to the
timestamps of the output packets.

12 years agomovenc: use the first cluster duration as the tfhd default duration
Justin Ruggles [Sun, 26 Feb 2012 22:21:07 +0000 (17:21 -0500)]
movenc: use the first cluster duration as the tfhd default duration

12 years agomovenc: factorize calculation of cluster duration into a separate function
Justin Ruggles [Sun, 26 Feb 2012 22:17:13 +0000 (17:17 -0500)]
movenc: factorize calculation of cluster duration into a separate function

12 years agodoc/APIchanges: fill in missing dates and hashes.
Anton Khirnov [Sun, 26 Feb 2012 10:52:24 +0000 (11:52 +0100)]
doc/APIchanges: fill in missing dates and hashes.

12 years agolavc: reorder AVCodecContext fields.
Anton Khirnov [Sun, 26 Feb 2012 09:01:08 +0000 (10:01 +0100)]
lavc: reorder AVCodecContext fields.

Put related fields together, move the important ones closer to the
beginning, try to eliminate holes.

12 years agolavc: reorder AVFrame fields.
Anton Khirnov [Sun, 26 Feb 2012 09:01:08 +0000 (10:01 +0100)]
lavc: reorder AVFrame fields.

Put related fields together, move the important ones closer to the
beginning, try to eliminate holes.

12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 27 Feb 2012 01:33:48 +0000 (02:33 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: don't guess r_frame_rate from either stream or codec timebase.
  avconv: set discard on input streams automatically.
  Fix parser not to clobber has_b_frames when extradata is set.
  lavf: don't set codec timebase in avformat_find_stream_info().
  avconv: saner output video timebase.
  rawdec: set timebase to 1/fps.
  avconv: refactor vsync code.
  FATE: remove a bunch of useless -vsync 0
  cdxl: bit line plane arrangement support
  cdxl: remove early check for bpp
  cdxl: set pix_fmt PAL8 only if palette is available

Conflicts:
ffmpeg.c
libavcodec/h264_parser.c
libavformat/rawdec.c
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/h264.mak
tests/fate/prores.mak
tests/fate/video.mak
tests/ref/fate/bethsoft-vid
tests/ref/fate/creatureshock-avs
tests/ref/fate/ea-cmv
tests/ref/fate/interplay-mve-16bit
tests/ref/fate/interplay-mve-8bit
tests/ref/fate/nuv
tests/ref/fate/prores-alpha
tests/ref/fate/qtrle-16bit
tests/ref/fate/qtrle-1bit
tests/ref/fate/real-rv40
tests/ref/fate/rpza
tests/ref/fate/wmv8-drm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoeval: add root() to solve f(x)=0
Michael Niedermayer [Tue, 21 Feb 2012 21:30:35 +0000 (22:30 +0100)]
eval: add root() to solve f(x)=0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoeval: Check that single parameter functions dont get a second param.
Michael Niedermayer [Wed, 22 Feb 2012 21:18:50 +0000 (22:18 +0100)]
eval: Check that single parameter functions dont get a second param.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoeval: Allow specifying the variable id.
Michael Niedermayer [Wed, 22 Feb 2012 16:21:04 +0000 (17:21 +0100)]
eval: Allow specifying the variable id.

Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolibavfilter/libmpcodecs: add vf_pp from current mplayer svn
Michael Niedermayer [Sun, 26 Feb 2012 14:14:36 +0000 (15:14 +0100)]
libavfilter/libmpcodecs: add vf_pp from current mplayer svn

This will allow us to do regression tests on libpostproc.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agocdxl demux: do not create packets with uninitialized data at EOF.
Reimar Döffinger [Sun, 26 Feb 2012 16:08:38 +0000 (17:08 +0100)]
cdxl demux: do not create packets with uninitialized data at EOF.

Fixes a failure in cdxl-pal8 test for the valgrind FATE instance.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agolavf: don't guess r_frame_rate from either stream or codec timebase.
Anton Khirnov [Mon, 28 Nov 2011 20:57:06 +0000 (21:57 +0100)]
lavf: don't guess r_frame_rate from either stream or codec timebase.

Neither of those is guaranteed to be connected to framerate in any way
(if it even exists).

Fixes bug 56.

12 years agoavconv: set discard on input streams automatically.
Anton Khirnov [Fri, 24 Feb 2012 13:14:24 +0000 (14:14 +0100)]
avconv: set discard on input streams automatically.

12 years agoFix parser not to clobber has_b_frames when extradata is set.
Reinhard Tartler [Sun, 26 Feb 2012 09:50:45 +0000 (10:50 +0100)]
Fix parser not to clobber has_b_frames when extradata is set.

Because in contrast to the decoder, the parser does not setup low_delay.
The code in parse_nal_units would always end up setting has_b_frames
to "1", except when stream is explicitly marked as low delay.
Since the parser itself would create 'extradata', simply reopening
the parser would cause this.

This happens for instance in estimate_timings_from_pts(), which causes the
parser to be reopened on the same stream.

This fixes Libav #22 and FFmpeg (trac) #360

CC: libav-stable@libav.org
Based on a patch by Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(commit 31ac0ac29b6bba744493f7d1040757a3f51b9ad7)

Comments and description adapted by Reinhard Tartler.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
12 years agolavf: don't set codec timebase in avformat_find_stream_info().
Anton Khirnov [Mon, 28 Nov 2011 08:31:48 +0000 (09:31 +0100)]
lavf: don't set codec timebase in avformat_find_stream_info().

It's not supposed to be set outside of lavc.

12 years agoavconv: saner output video timebase.
Anton Khirnov [Tue, 7 Feb 2012 10:03:33 +0000 (11:03 +0100)]
avconv: saner output video timebase.

r_frame_rate should in theory have something to do with input framerate,
but in practice it is often made up from thin air by lavf. So unless we
are targeting a constant output framerate, it's better to just use input
stream timebase.

Brings back dropped frames in nuv and cscd tests introduced in
cd1ad18a6539bd7fc2dc4c1740fbcbd498c0c0a2

12 years agorawdec: set timebase to 1/fps.
Anton Khirnov [Tue, 7 Feb 2012 07:13:05 +0000 (08:13 +0100)]
rawdec: set timebase to 1/fps.

12 years agoavconv: refactor vsync code.
Anton Khirnov [Mon, 6 Feb 2012 20:47:41 +0000 (21:47 +0100)]
avconv: refactor vsync code.

No functional changes, just make it more readable.

12 years agoFATE: remove a bunch of useless -vsync 0
Anton Khirnov [Fri, 24 Feb 2012 18:24:27 +0000 (19:24 +0100)]
FATE: remove a bunch of useless -vsync 0

No changes in the test results.

12 years agocdxl: bit line plane arrangement support
Paul B Mahol [Sat, 25 Feb 2012 17:16:41 +0000 (17:16 +0000)]
cdxl: bit line plane arrangement support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years agocdxl: remove early check for bpp
Paul B Mahol [Sat, 25 Feb 2012 17:16:40 +0000 (17:16 +0000)]
cdxl: remove early check for bpp

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years agocdxl: set pix_fmt PAL8 only if palette is available
Paul B Mahol [Sat, 25 Feb 2012 17:16:39 +0000 (17:16 +0000)]
cdxl: set pix_fmt PAL8 only if palette is available

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 26 Feb 2012 03:47:56 +0000 (04:47 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (34 commits)
  mlp_parser: fix the channel mask value used for the top surround channel
  vorbisenc: check all allocations for failure
  roqaudioenc: return AVERROR codes instead of -1
  roqaudioenc: set correct bit rate
  roqaudioenc: use AVCodecContext.frame_size correctly.
  roqaudioenc: remove unneeded sample_fmt check
  ra144enc: use int16_t* for input samples rather than void*
  ra144enc: set AVCodecContext.coded_frame
  ra144enc: remove unneeded sample_fmt check
  nellymoserenc: set AVCodecContext.coded_frame
  nellymoserenc: improve error checking in encode_init()
  nellymoserenc: return AVERROR codes instead of -1
  libvorbis: improve error checking in oggvorbis_encode_init()
  mpegaudioenc: return AVERROR codes instead of -1
  libfaac: improve error checking and handling in Faac_encode_init()
  avutil: add AVERROR_UNKNOWN
  check for coded_frame allocation failure in several audio encoders
  audio encoders: do not set coded_frame->key_frame.
  g722enc: check for trellis data allocation error
  libspeexenc: export encoder delay through AVCodecContext.delay
  ...

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/fraps.c
libavcodec/kgv1dec.c
libavcodec/libfaac.c
libavcodec/libgsm.c
libavcodec/libvorbis.c
libavcodec/mlp_parser.c
libavcodec/roqaudioenc.c
libavcodec/vorbisenc.c
libavutil/avutil.h
libavutil/error.c
libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomlp_parser: fix the channel mask value used for the top surround channel
Tim Walker [Sat, 25 Feb 2012 21:33:48 +0000 (22:33 +0100)]
mlp_parser: fix the channel mask value used for the top surround channel

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years agovorbisenc: check all allocations for failure
Justin Ruggles [Thu, 23 Feb 2012 00:23:18 +0000 (19:23 -0500)]
vorbisenc: check all allocations for failure

12 years agoroqaudioenc: return AVERROR codes instead of -1
Justin Ruggles [Wed, 22 Feb 2012 23:33:39 +0000 (18:33 -0500)]
roqaudioenc: return AVERROR codes instead of -1

12 years agoroqaudioenc: set correct bit rate
Justin Ruggles [Wed, 22 Feb 2012 23:32:19 +0000 (18:32 -0500)]
roqaudioenc: set correct bit rate

12 years agoroqaudioenc: use AVCodecContext.frame_size correctly.
Justin Ruggles [Wed, 22 Feb 2012 21:20:49 +0000 (16:20 -0500)]
roqaudioenc: use AVCodecContext.frame_size correctly.

It is not allowed to change mid-stream like it does currently. Instead we need
to buffer the first 8 frames before returning them as a single packet, then
only return single frame packets after that.

12 years agoroqaudioenc: remove unneeded sample_fmt check
Justin Ruggles [Wed, 22 Feb 2012 18:40:03 +0000 (13:40 -0500)]
roqaudioenc: remove unneeded sample_fmt check

12 years agora144enc: use int16_t* for input samples rather than void*
Justin Ruggles [Wed, 22 Feb 2012 18:35:38 +0000 (13:35 -0500)]
ra144enc: use int16_t* for input samples rather than void*

12 years agora144enc: set AVCodecContext.coded_frame
Justin Ruggles [Wed, 22 Feb 2012 18:29:09 +0000 (13:29 -0500)]
ra144enc: set AVCodecContext.coded_frame

12 years agora144enc: remove unneeded sample_fmt check
Justin Ruggles [Wed, 22 Feb 2012 18:10:38 +0000 (13:10 -0500)]
ra144enc: remove unneeded sample_fmt check

12 years agonellymoserenc: set AVCodecContext.coded_frame
Justin Ruggles [Tue, 21 Feb 2012 23:47:50 +0000 (18:47 -0500)]
nellymoserenc: set AVCodecContext.coded_frame

12 years agonellymoserenc: improve error checking in encode_init()
Justin Ruggles [Tue, 21 Feb 2012 23:46:00 +0000 (18:46 -0500)]
nellymoserenc: improve error checking in encode_init()

12 years agonellymoserenc: return AVERROR codes instead of -1
Justin Ruggles [Tue, 21 Feb 2012 23:42:32 +0000 (18:42 -0500)]
nellymoserenc: return AVERROR codes instead of -1

12 years agolibvorbis: improve error checking in oggvorbis_encode_init()
Justin Ruggles [Tue, 21 Feb 2012 23:40:22 +0000 (18:40 -0500)]
libvorbis: improve error checking in oggvorbis_encode_init()

12 years agompegaudioenc: return AVERROR codes instead of -1
Justin Ruggles [Tue, 21 Feb 2012 20:27:23 +0000 (15:27 -0500)]
mpegaudioenc: return AVERROR codes instead of -1

12 years agolibfaac: improve error checking and handling in Faac_encode_init()
Justin Ruggles [Thu, 16 Feb 2012 00:06:34 +0000 (19:06 -0500)]
libfaac: improve error checking and handling in Faac_encode_init()

12 years agoavutil: add AVERROR_UNKNOWN
Justin Ruggles [Sat, 25 Feb 2012 04:27:14 +0000 (23:27 -0500)]
avutil: add AVERROR_UNKNOWN

Useful to return instead of -1 when the cause of the error is unknown,
typically from an external library.

12 years agocheck for coded_frame allocation failure in several audio encoders
Justin Ruggles [Thu, 16 Feb 2012 00:26:09 +0000 (19:26 -0500)]
check for coded_frame allocation failure in several audio encoders

12 years agoaudio encoders: do not set coded_frame->key_frame.
Justin Ruggles [Thu, 16 Feb 2012 00:11:06 +0000 (19:11 -0500)]
audio encoders: do not set coded_frame->key_frame.

it is already set in avcodec_alloc_frame()

12 years agog722enc: check for trellis data allocation error
Justin Ruggles [Mon, 20 Feb 2012 18:12:37 +0000 (13:12 -0500)]
g722enc: check for trellis data allocation error

12 years agolibspeexenc: export encoder delay through AVCodecContext.delay
Justin Ruggles [Fri, 10 Feb 2012 02:03:02 +0000 (21:03 -0500)]
libspeexenc: export encoder delay through AVCodecContext.delay

12 years agoavcodec: document the use of AVCodecContext.delay for audio encoders
Justin Ruggles [Mon, 20 Feb 2012 21:52:27 +0000 (16:52 -0500)]
avcodec: document the use of AVCodecContext.delay for audio encoders

12 years agokgv1: release reference picture on size change.
Ronald S. Bultje [Sat, 25 Feb 2012 00:27:53 +0000 (16:27 -0800)]
kgv1: release reference picture on size change.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years agomatroska: don't overwrite string values until read/alloc was succesful.
Ronald S. Bultje [Sat, 25 Feb 2012 00:12:18 +0000 (16:12 -0800)]
matroska: don't overwrite string values until read/alloc was succesful.

This prevents certain tags with a default value assigned to them (as per
the EBML syntax elements) from ever being assigned a NULL value. Other
parts of the code rely on these being non-NULL (i.e. they don't check for
NULL before e.g. using the string in strcmp() or similar), and thus in
effect this prevents crashes when reading of such specific tags fails,
either because of low memory or because of targeted file corruption.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years agolavc: merge two if()s with the same condition.
Anton Khirnov [Fri, 24 Feb 2012 12:07:57 +0000 (13:07 +0100)]
lavc: merge two if()s with the same condition.

12 years agolavc: factorize setting got_packet_ptr in avcodec_encode_video2()
Anton Khirnov [Fri, 24 Feb 2012 12:06:23 +0000 (13:06 +0100)]
lavc: factorize setting got_packet_ptr in avcodec_encode_video2()

12 years agolavc: signal no output when a NULL frame is passed to audio encoder without delay
Anton Khirnov [Fri, 24 Feb 2012 12:02:05 +0000 (13:02 +0100)]
lavc: signal no output when a NULL frame is passed to audio encoder without delay

12 years agoxwdenc: fix monow encoding
Paul B Mahol [Fri, 24 Feb 2012 04:53:26 +0000 (04:53 +0000)]
xwdenc: fix monow encoding

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agompegaudiodec: dont memcpy() more than needed.
Michael Niedermayer [Sat, 25 Feb 2012 05:47:57 +0000 (06:47 +0100)]
mpegaudiodec: dont memcpy() more than needed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agofate: add tests for cdxl video
Paul B Mahol [Tue, 21 Feb 2012 21:44:21 +0000 (21:44 +0000)]
fate: add tests for cdxl video

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years agocdxl: fix ham6/8 on big endian
Paul B Mahol [Tue, 21 Feb 2012 20:41:14 +0000 (20:41 +0000)]
cdxl: fix ham6/8 on big endian

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 25 Feb 2012 03:00:43 +0000 (04:00 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  docs: use -bsf:[vas] instead of -[vas]bsf.
  mpegaudiodec: Prevent premature clipping of mp3 input buffer.
  lavf: move the packet keyframe setting code.
  oggenc: free comment header for all codecs
  lcl: error out if uncompressed input buffer is smaller than framesize.
  mjpeg: abort decoding if packet is too large.
  golomb: use HAVE_BITS_REMAINING() macro to prevent infloop on EOF.
  get_bits: add HAVE_BITS_REMAINING macro.
  lavf/output-example: use new audio encoding API correctly.
  lavf/output-example: more proper usage of the new API.
  tiff: Prevent overreads in the type_sizes array.
  tiff: Make the TIFF_LONG and TIFF_SHORT types unsigned.
  apetag: do not leak memory if avio_read() fails
  apetag: propagate errors.
  SBR DSP x86: implement SSE sbr_hf_g_filt
  SBR DSP x86: implement SSE sbr_sum_square_sse
  SBR DSP: use intptr_t for the ixh parameter.

Conflicts:
doc/bitstream_filters.texi
doc/examples/muxing.c
doc/ffmpeg.texi
libavcodec/golomb.h
libavcodec/x86/Makefile
libavformat/oggenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoadpcmdec: fix "warning: array subscript is above array bounds"
Michael Niedermayer [Sat, 25 Feb 2012 01:50:58 +0000 (02:50 +0100)]
adpcmdec: fix "warning: array subscript is above array bounds"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoa64multienc: fix "warning: buf may be used uninitialized in this function"
Michael Niedermayer [Sat, 25 Feb 2012 01:41:42 +0000 (02:41 +0100)]
a64multienc: fix "warning: buf may be used uninitialized in this function"

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