ffmpeg.git
8 years agomp3demux: fix off by 1 error
Michael Niedermayer [Tue, 8 May 2012 01:45:17 +0000 (03:45 +0200)]
mp3demux: fix off by 1 error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomp3decoder: discard ID3 tags
Michael Niedermayer [Tue, 8 May 2012 01:13:37 +0000 (03:13 +0200)]
mp3decoder: discard ID3 tags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc/utils: change a few asserts to av_assert0()
Michael Niedermayer [Tue, 8 May 2012 00:25:14 +0000 (02:25 +0200)]
lavc/utils: change a few asserts to av_assert0()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaudio_frame_que: simplify
Michael Niedermayer [Wed, 11 Apr 2012 18:14:56 +0000 (20:14 +0200)]
audio_frame_que: simplify

Also update libav->ffmpeg as theres pretty much no code left from libav.
The new code is faster, requires fewer mallocs and less memory. Its
also half the number of lines of code.

This code is not 100% identical in behavior to the previous, but the
differences appear to be rather limitations of the previous design
than intended though i could be wrong of course.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomovenc: store codecs that dont provide a frame_size as audio_vbr=1
Michael Niedermayer [Mon, 7 May 2012 21:32:45 +0000 (23:32 +0200)]
movenc: store codecs that dont provide a frame_size as audio_vbr=1

Fixes Ticket1240

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 7 May 2012 20:42:41 +0000 (22:42 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libschroedinger: Switch to function names more in line with Libav style.
  Move code shared between libdirac and libschroedinger to libschroedinger.
  lavfi: uninline avfilter_copy_buffer_ref_props().
  lavf: add missing '*' in a doxy.
  h264: Remove a commented-out function pointer typedef.
  txd: Remove write-only variable in txd_decode_frame().
  mmvideo.c: Remove unused variable in mm_decode_pal().
  build: cosmetics: Add missing end-of-line backslashes to item lists.
  build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
  libschroedinger: Move a function to avoid a forward declaration.
  pthread: warn on high thread counts
  vf_yadif: fix missing error handling for avfilter_poll_frame()
  avprobe: allow showing only one container/stream property.
  lavfi: support audio in avfilter_copy_frame_props().
  lavfi: avfilter_merge_formats: handle case where inputs are same
  lavc: add sample rate and channel layout to AVFrame.
  zerocodec: check if the previous frame is missing
  doc: clarify check for NULL pointer style

Conflicts:
doc/APIchanges
doc/developer.texi
ffprobe.c
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/libdirac_libschro.c
libavcodec/libdirac_libschro.h
libavcodec/mmvideo.c
libavcodec/txd.c
libavcodec/version.h
libavcodec/zerocodec.c
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/version.h
libavformat/Makefile
libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegvideo: double thread limit
Michael Niedermayer [Mon, 7 May 2012 18:08:56 +0000 (20:08 +0200)]
mpegvideo: double thread limit

16 seems a bit tight for current high end and expected near term future boxes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaacdec: Add forgotten flush
Ole Dittmann [Mon, 7 May 2012 13:43:42 +0000 (15:43 +0200)]
aacdec: Add forgotten flush

See Ticket420

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: print next_dts too on debug_ts
Michael Niedermayer [Mon, 7 May 2012 16:30:26 +0000 (18:30 +0200)]
ffmpeg: print next_dts too on debug_ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoDecode XBR extension in first asset
Nick Brereton [Thu, 26 Apr 2012 14:56:08 +0000 (15:56 +0100)]
Decode XBR extension in first asset

Reviewed-by: Benjamin Larsson <benjamin@southpole.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomp3enc: avoid ifdef
Michael Niedermayer [Mon, 7 May 2012 10:53:58 +0000 (12:53 +0200)]
mp3enc: avoid ifdef

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomp3enc: Fix Xing tag identification string for CBR files
Tobias Rapp [Mon, 7 May 2012 09:55:05 +0000 (11:55 +0200)]
mp3enc: Fix Xing tag identification string for CBR files

Fixes the Xing tag identification string to be "Info" for MP3 files with
constant bitrate. The previous "Xing" caused some decoders to recognize the
file as VBR.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibschroedinger: Switch to function names more in line with Libav style.
Diego Biurrun [Sat, 14 Apr 2012 13:39:22 +0000 (15:39 +0200)]
libschroedinger: Switch to function names more in line with Libav style.

8 years agoMove code shared between libdirac and libschroedinger to libschroedinger.
Diego Biurrun [Sat, 14 Apr 2012 13:24:57 +0000 (15:24 +0200)]
Move code shared between libdirac and libschroedinger to libschroedinger.

This also involves making some function static and changing the name
prefixes of some functions and structures.

8 years agolavfi: uninline avfilter_copy_buffer_ref_props().
Anton Khirnov [Mon, 7 May 2012 05:15:06 +0000 (07:15 +0200)]
lavfi: uninline avfilter_copy_buffer_ref_props().

A nontrivial public function such as this should most certainly NOT be
inline.

8 years agolavf: add missing '*' in a doxy.
Anton Khirnov [Mon, 7 May 2012 10:21:19 +0000 (12:21 +0200)]
lavf: add missing '*' in a doxy.

8 years agoh264: Remove a commented-out function pointer typedef.
Diego Biurrun [Mon, 7 May 2012 11:45:13 +0000 (13:45 +0200)]
h264: Remove a commented-out function pointer typedef.

8 years agotxd: Remove write-only variable in txd_decode_frame().
Diego Biurrun [Thu, 19 Apr 2012 12:55:06 +0000 (14:55 +0200)]
txd: Remove write-only variable in txd_decode_frame().

libavcodec/txd.c:49:60: warning: variable ‘mipmap_count’ set but not used

8 years agommvideo.c: Remove unused variable in mm_decode_pal().
Diego Biurrun [Thu, 19 Apr 2012 12:49:51 +0000 (14:49 +0200)]
mmvideo.c: Remove unused variable in mm_decode_pal().

libavcodec/mmvideo.c:87:9: warning: variable ‘i’ set but not used

8 years agobuild: cosmetics: Add missing end-of-line backslashes to item lists.
Diego Biurrun [Mon, 7 May 2012 10:08:58 +0000 (12:08 +0200)]
build: cosmetics: Add missing end-of-line backslashes to item lists.

8 years agobuild: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
Diego Biurrun [Sat, 14 Apr 2012 11:05:08 +0000 (13:05 +0200)]
build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.

8 years agolibschroedinger: Move a function to avoid a forward declaration.
Diego Biurrun [Sat, 14 Apr 2012 13:40:58 +0000 (15:40 +0200)]
libschroedinger: Move a function to avoid a forward declaration.

8 years agopthread: warn on high thread counts
Sean McGovern [Mon, 19 Mar 2012 05:08:14 +0000 (01:08 -0400)]
pthread: warn on high thread counts

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agovf_yadif: fix missing error handling for avfilter_poll_frame()
Robert Nagy [Sun, 15 Apr 2012 13:46:37 +0000 (15:46 +0200)]
vf_yadif: fix missing error handling for avfilter_poll_frame()

8 years agoavprobe: allow showing only one container/stream property.
Ronald S. Bultje [Thu, 3 May 2012 18:23:01 +0000 (20:23 +0200)]
avprobe: allow showing only one container/stream property.

This is useful for writing unit tests.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavfi: support audio in avfilter_copy_frame_props().
Anton Khirnov [Sat, 5 May 2012 11:11:53 +0000 (13:11 +0200)]
lavfi: support audio in avfilter_copy_frame_props().

8 years agolavfi: avfilter_merge_formats: handle case where inputs are same
Mina Nagy Zaki [Wed, 8 Jun 2011 16:24:25 +0000 (19:24 +0300)]
lavfi: avfilter_merge_formats: handle case where inputs are same

This fixes a double-free crash if lists are the same due to the two
merge_ref() calls at the end of the (useless) merging that happens.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavc: add sample rate and channel layout to AVFrame.
Anton Khirnov [Fri, 4 May 2012 17:12:31 +0000 (19:12 +0200)]
lavc: add sample rate and channel layout to AVFrame.

Rationale is the same as for video width/height etc.

8 years agoffm: disable adjust_write_index()
Michael Niedermayer [Mon, 7 May 2012 00:42:00 +0000 (02:42 +0200)]
ffm: disable adjust_write_index()

This code can in its current form not work with ffserver
Fixes Ticket1249

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agozerocodec: check if the previous frame is missing
Paul B Mahol [Fri, 4 May 2012 16:32:43 +0000 (12:32 -0400)]
zerocodec: check if the previous frame is missing

ZeroCodec relies on the keyframe flag being set in the container, and
prev is the previously decoded frame. A keyframe flags incorrectly set
will lead to this condition.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agodoc: clarify check for NULL pointer style
Luca Barbato [Fri, 4 May 2012 17:03:42 +0000 (10:03 -0700)]
doc: clarify check for NULL pointer style

Our code should be terse and clear.

8 years agoyadif: Add yuva444p to format list.
Robert Nagy [Sun, 6 May 2012 20:51:37 +0000 (22:51 +0200)]
yadif: Add yuva444p to format list.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: fix silence buffer for planar U8
Michael Niedermayer [Sun, 6 May 2012 22:05:19 +0000 (00:05 +0200)]
swr: fix silence buffer for planar U8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: fix cpy() after the len was changed to be in samples.
Michael Niedermayer [Sun, 6 May 2012 22:04:44 +0000 (00:04 +0200)]
swr: fix cpy() after the len was changed to be in samples.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 6 May 2012 19:31:08 +0000 (21:31 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (28 commits)
  dfa: use more meaningful return codes
  eatgv: check vector_bits
  eatgv: check motion vectors
  Mark a number of variables only used in av_dlog() calls as av_unused.
  dvdec: drop const qualifier from variable to eliminate a warning
  avcodec: Improve comment for thread_safe_callbacks to avoid misinterpretation.
  tests/utils: don't ignore the return value of fwrite()
  lavfi/formats: use sizeof(var) instead of sizeof(type).
  lavfi: remove avfilter_default_config_input_link() declaration
  lavfi: always enable the scale filter and depend on sws.
  vf_split: support user-specifiable number of outputs.
  avconv: remove stray useless comment.
  mpegmux: add stuffing to avoid incomplete PCM frames
  rtsp: avoid const warnings from strtol() call
  avserver: check return value of ftruncate()
  lagarith: make offset array type unsigned
  dfa: add some checks to ensure that decoder won't write past frame end
  aacps: NEON optimisations
  aacps: align some arrays
  aacps: move some loops to function pointers
  ...

Conflicts:
configure
doc/filters.texi
libavcodec/dfa.c
libavcodec/eatgv.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/avfilter.h
libavfilter/formats.c
libavfilter/vf_split.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr-x86-simd: add ff_unpack_2ch_int16_to_int16/int32/float_a_ssse3
Michael Niedermayer [Sun, 6 May 2012 17:39:52 +0000 (19:39 +0200)]
swr-x86-simd: add ff_unpack_2ch_int16_to_int16/int32/float_a_ssse3

more than 10% faster (tested on sandybridge)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodfa: use more meaningful return codes
Kostya Shishkov [Sun, 6 May 2012 07:46:19 +0000 (09:46 +0200)]
dfa: use more meaningful return codes

8 years agoeatgv: check vector_bits
Michael Niedermayer [Sun, 15 Apr 2012 11:29:50 +0000 (13:29 +0200)]
eatgv: check vector_bits

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
8 years agoeatgv: check motion vectors
Kostya Shishkov [Sat, 5 May 2012 12:27:35 +0000 (14:27 +0200)]
eatgv: check motion vectors

8 years agoswr: audioconvert: consider mono to be planar
Michael Niedermayer [Sun, 6 May 2012 16:04:09 +0000 (18:04 +0200)]
swr: audioconvert: consider mono to be planar

This way it will be handled by the planar==planar SIMD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMark a number of variables only used in av_dlog() calls as av_unused.
Diego Biurrun [Thu, 19 Apr 2012 12:48:16 +0000 (14:48 +0200)]
Mark a number of variables only used in av_dlog() calls as av_unused.

This fixes a number of unused-but-set gcc warnings.

8 years agodvdec: drop const qualifier from variable to eliminate a warning
Diego Biurrun [Mon, 16 Apr 2012 09:38:02 +0000 (11:38 +0200)]
dvdec: drop const qualifier from variable to eliminate a warning

libavcodec/dvdec.c:344:12: warning: assignment discards ‘const’ qualifier from pointer target type

8 years agoavcodec: Improve comment for thread_safe_callbacks to avoid misinterpretation.
Robert Nagy [Sat, 14 Apr 2012 18:31:45 +0000 (20:31 +0200)]
avcodec: Improve comment for thread_safe_callbacks to avoid misinterpretation.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agotests/utils: don't ignore the return value of fwrite()
Sean McGovern [Thu, 26 Apr 2012 18:56:24 +0000 (14:56 -0400)]
tests/utils: don't ignore the return value of fwrite()

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoswr-x86-simd: stereo unpack S16/S32/FLT-> S16/S32/FLT SSE/SSE2 (16 new SIMD functions)
Michael Niedermayer [Sun, 6 May 2012 15:22:33 +0000 (17:22 +0200)]
swr-x86-simd: stereo unpack S16/S32/FLT-> S16/S32/FLT SSE/SSE2 (16 new SIMD functions)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr-x86-simd: create prototypes with macros, this is simpler.
Michael Niedermayer [Sun, 6 May 2012 13:22:42 +0000 (15:22 +0200)]
swr-x86-simd: create prototypes with macros, this is simpler.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr-x86-SIMD: 3 instructions less for stereo planar->packed s32/flt->s16
Michael Niedermayer [Sun, 6 May 2012 10:59:59 +0000 (12:59 +0200)]
swr-x86-SIMD: 3 instructions less for stereo planar->packed s32/flt->s16

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoCrystalHD: Improve detection of field pair -> two fields content.
Philip Langdale [Sat, 5 May 2012 16:58:39 +0000 (09:58 -0700)]
CrystalHD: Improve detection of field pair -> two fields content.

Istvan Sebok provided a sample where field pair -> two fields content
was being misdetected by the existing logic. I added an additional
test to check the input picture type as identified by our h.264
parser.

Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi/formats: use sizeof(var) instead of sizeof(type).
Anton Khirnov [Fri, 4 May 2012 07:49:28 +0000 (09:49 +0200)]
lavfi/formats: use sizeof(var) instead of sizeof(type).

8 years agolavfi: remove avfilter_default_config_input_link() declaration
Stefano Sabatini [Sat, 6 Aug 2011 10:11:12 +0000 (12:11 +0200)]
lavfi: remove avfilter_default_config_input_link() declaration

The function is not implemented (and possibly useless).

8 years agolavfi: always enable the scale filter and depend on sws.
Anton Khirnov [Sat, 5 May 2012 08:22:55 +0000 (10:22 +0200)]
lavfi: always enable the scale filter and depend on sws.

The scale filter is used for internal colorspace conversions, so it must
always be present.

8 years agovf_split: support user-specifiable number of outputs.
Anton Khirnov [Fri, 27 Apr 2012 05:41:32 +0000 (07:41 +0200)]
vf_split: support user-specifiable number of outputs.

8 years agoavconv: remove stray useless comment.
Anton Khirnov [Sat, 5 May 2012 12:17:19 +0000 (14:17 +0200)]
avconv: remove stray useless comment.

8 years agovsrc_buffer: deprecate the header.
Nicolas George [Sat, 5 May 2012 07:54:41 +0000 (09:54 +0200)]
vsrc_buffer: deprecate the header.

8 years agovsrc_buffer: deprecate av_vsrc_buffer_add_video_buffer_ref.
Nicolas George [Sat, 5 May 2012 07:53:28 +0000 (09:53 +0200)]
vsrc_buffer: deprecate av_vsrc_buffer_add_video_buffer_ref.

8 years agosrc_buffer: update get_nb_failed_requests name.
Nicolas George [Sat, 5 May 2012 07:50:30 +0000 (09:50 +0200)]
src_buffer: update get_nb_failed_requests name.

Implement av_buffersrc_get_nb_failed_requests.
Deprecate av_vsrc_buffer_get_nb_failed_requests.

8 years agoasrc_abuffer: deprecate the header.
Nicolas George [Sat, 5 May 2012 07:45:02 +0000 (09:45 +0200)]
asrc_abuffer: deprecate the header.

8 years agoasrc_abuffer: deprecate av_asrc_buffer_* functions.
Nicolas George [Sat, 5 May 2012 07:40:27 +0000 (09:40 +0200)]
asrc_abuffer: deprecate av_asrc_buffer_* functions.

8 years agolavfi: install buffersrc.h.
Nicolas George [Sat, 5 May 2012 07:41:36 +0000 (09:41 +0200)]
lavfi: install buffersrc.h.

8 years agolavfi: remove av_buffersrc_buffer.
Nicolas George [Sat, 5 May 2012 07:26:52 +0000 (09:26 +0200)]
lavfi: remove av_buffersrc_buffer.

It is no longer used anywhere.

Furthermore, the header it was declared in was not installed,
so it can not be considered part of the public API.

8 years agobuffersrc: fix av_buffersrc_add_ref doxy.
Nicolas George [Sun, 6 May 2012 14:17:08 +0000 (16:17 +0200)]
buffersrc: fix av_buffersrc_add_ref doxy.

av_buffersrc_add_ref can handle audio too now.

8 years agoffmpeg: do not include vsrc_buffer.h.
Nicolas George [Sat, 5 May 2012 07:52:05 +0000 (09:52 +0200)]
ffmpeg: do not include vsrc_buffer.h.

8 years agoffmpeg: replace av_vsrc_buffer_add_frame by av_buffersrc_add_frame.
Nicolas George [Sat, 5 May 2012 07:33:55 +0000 (09:33 +0200)]
ffmpeg: replace av_vsrc_buffer_add_frame by av_buffersrc_add_frame.

8 years agoffmpeg: replace av_buffersrc_buffer with av_buffersrc_add_ref.
Nicolas George [Sat, 5 May 2012 07:22:24 +0000 (09:22 +0200)]
ffmpeg: replace av_buffersrc_buffer with av_buffersrc_add_ref.

8 years agompegmux: add stuffing to avoid incomplete PCM frames
Janne Grunau [Tue, 13 Mar 2012 17:12:06 +0000 (18:12 +0100)]
mpegmux: add stuffing to avoid incomplete PCM frames

Fixes https://bugzilla.libav.org/show_bug.cgi?id=244

8 years agortsp: avoid const warnings from strtol() call
Mans Rullgard [Wed, 25 Apr 2012 22:37:29 +0000 (23:37 +0100)]
rtsp: avoid const warnings from strtol() call

The strtol() interface makes it difficult to use with
const-qualified pointers.  With this change, although
the const is still lost, the compiler does not warn
about it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoavserver: check return value of ftruncate()
Mans Rullgard [Sat, 21 Apr 2012 16:01:35 +0000 (17:01 +0100)]
avserver: check return value of ftruncate()

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agooggparsevorbis.c: Check for OOM when using av_mallocz.
Carl Eugen Hoyos [Sun, 6 May 2012 10:00:19 +0000 (12:00 +0200)]
oggparsevorbis.c: Check for OOM when using av_mallocz.

8 years agolagarith: make offset array type unsigned
Kostya Shishkov [Sat, 5 May 2012 11:45:03 +0000 (13:45 +0200)]
lagarith: make offset array type unsigned

This is logical and also fixes checking for the fourth plane offset.

8 years agodfa: add some checks to ensure that decoder won't write past frame end
Kostya Shishkov [Thu, 3 May 2012 18:10:36 +0000 (20:10 +0200)]
dfa: add some checks to ensure that decoder won't write past frame end

8 years agoaacps: NEON optimisations
Mans Rullgard [Tue, 13 Mar 2012 13:20:29 +0000 (13:20 +0000)]
aacps: NEON optimisations

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoaacps: align some arrays
Mans Rullgard [Fri, 27 Jan 2012 01:24:55 +0000 (01:24 +0000)]
aacps: align some arrays

This is required for SIMD optimisations.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoaacps: move some loops to function pointers
Mans Rullgard [Fri, 27 Jan 2012 01:22:55 +0000 (01:22 +0000)]
aacps: move some loops to function pointers

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agortpdec_h264: Add missing newlines to av_log calls
Martin Storsjö [Sat, 5 May 2012 17:48:08 +0000 (20:48 +0300)]
rtpdec_h264: Add missing newlines to av_log calls

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortpdec_h264: Free old extradata before clearing the pointer
Martin Storsjö [Sat, 5 May 2012 13:55:20 +0000 (16:55 +0300)]
rtpdec_h264: Free old extradata before clearing the pointer

This avoids memory leaks if there actually was some extradata
set before.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 5 May 2012 18:10:45 +0000 (20:10 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  tests: Refactor rotozoom/videogen common code into a separate file.
  tests: Mark some file-internal symbols as static.
  build: Drop leftover .exp pattern from LIBSUFFIXES list.
  vsrc_buffer: return EAGAIN if no frame is available.
  WMAL: Shift output samples by the specified number of padding zeroes.
  WMAL: Restore removed code in mclms_predict()
  rtpdec_h264: Remove a useless ifdef
  rtpdec_h264: Remove outdated/useless/incorrect comments
  rtpdec_h264: Remove useless memory corruption checks
  rtpdec_h264: Return proper error codes
  rtpdec_h264: Check the available data length before reading
  rtpdec_h264: Add input size checks
  png: check bit depth for PAL8/Y400A pixel formats.
  ea: check chunk_size for validity.
  celp filters: Do not read earlier than the start of the 'out' vector.

Conflicts:
libavcodec/pngdec.c
libavfilter/src_buffer.c
tests/rotozoom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: replace the remaining 2 audio convert SIMD macros by the new ones
Michael Niedermayer [Sat, 5 May 2012 17:59:57 +0000 (19:59 +0200)]
swr: replace the remaining 2 audio convert SIMD macros by the new ones

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: fix internal asm labels
Michael Niedermayer [Sat, 5 May 2012 17:43:11 +0000 (19:43 +0200)]
swr: fix internal asm labels

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: fix PACK_2CH register count
Michael Niedermayer [Sat, 5 May 2012 17:42:52 +0000 (19:42 +0200)]
swr: fix PACK_2CH register count

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: replace planar->planar/packed->packed FLT<->S16/S32 SIMD by new macros
Michael Niedermayer [Sat, 5 May 2012 17:41:39 +0000 (19:41 +0200)]
swr: replace planar->planar/packed->packed FLT<->S16/S32 SIMD by new macros

this simplifies the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agortpdec_h264: Reorder code blocks
Martin Storsjö [Fri, 4 May 2012 21:38:05 +0000 (00:38 +0300)]
rtpdec_h264: Reorder code blocks

This removes one level of indentation.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortpdec_h264: Make start_sequence a static const array
Martin Storsjö [Fri, 4 May 2012 21:33:39 +0000 (00:33 +0300)]
rtpdec_h264: Make start_sequence a static const array

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortpdec_h264: Cleanup debug packet type counting
Martin Storsjö [Fri, 4 May 2012 21:28:25 +0000 (00:28 +0300)]
rtpdec_h264: Cleanup debug packet type counting

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortpdec_h264: Cosmetic cleanup
Martin Storsjö [Sat, 5 May 2012 14:42:15 +0000 (16:42 +0200)]
rtpdec_h264: Cosmetic cleanup

Add/fix spacing, split long lines, align assignments where suitable.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortpdec_h264: Clean up comments
Martin Storsjö [Fri, 4 May 2012 21:05:52 +0000 (00:05 +0300)]
rtpdec_h264: Clean up comments

Split long comments, move long comments at the end of lines to
separate lines above, fix vertical alignment, fix up comment style
(unify trailing dots - comments had a mix of 2, 3 or 4 dots, where
it would be just as good without them at all).

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortpdec_h264: Convert commented out code into setting an unused variable
Martin Storsjö [Fri, 4 May 2012 21:02:15 +0000 (00:02 +0300)]
rtpdec_h264: Convert commented out code into setting an unused variable

It is worth keeping instead of removing, in case reading this
bit becomes necessary at some later point.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoswr: implement stereo S16/S32/FLT->S16/S32/FLT planar->packed in SSE/SSE2
Michael Niedermayer [Sat, 5 May 2012 13:31:06 +0000 (15:31 +0200)]
swr: implement stereo S16/S32/FLT->S16/S32/FLT planar->packed in SSE/SSE2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: update calling code to support mixed packed planar SIMD
Michael Niedermayer [Sat, 5 May 2012 16:31:04 +0000 (18:31 +0200)]
swr: update calling code to support mixed packed planar SIMD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: change simd len argument to be in samples instead of dst bytes.
Michael Niedermayer [Sat, 5 May 2012 16:30:17 +0000 (18:30 +0200)]
swr: change simd len argument to be in samples instead of dst bytes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr-test: allow testing a specific subset of cases
Michael Niedermayer [Sat, 5 May 2012 16:22:48 +0000 (18:22 +0200)]
swr-test: allow testing a specific subset of cases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotests: Refactor rotozoom/videogen common code into a separate file.
Diego Biurrun [Mon, 30 Apr 2012 14:44:31 +0000 (16:44 +0200)]
tests: Refactor rotozoom/videogen common code into a separate file.

8 years agotests: Mark some file-internal symbols as static.
Diego Biurrun [Mon, 30 Apr 2012 14:29:26 +0000 (16:29 +0200)]
tests: Mark some file-internal symbols as static.

8 years agobuild: Drop leftover .exp pattern from LIBSUFFIXES list.
Diego Biurrun [Mon, 30 Apr 2012 08:33:49 +0000 (10:33 +0200)]
build: Drop leftover .exp pattern from LIBSUFFIXES list.

8 years agoRemove unused variable from ffv1 decoder.
Carl Eugen Hoyos [Sat, 5 May 2012 12:54:57 +0000 (14:54 +0200)]
Remove unused variable from ffv1 decoder.

8 years agoSkip padding bytes after reading musepack8 header.
Carl Eugen Hoyos [Sat, 5 May 2012 12:46:38 +0000 (14:46 +0200)]
Skip padding bytes after reading musepack8 header.

Fixes ticket #1160.

8 years agoalsdec.c: Also test 0 when checking rice decoder values.
Carl Eugen Hoyos [Sat, 5 May 2012 11:19:35 +0000 (13:19 +0200)]
alsdec.c: Also test 0 when checking rice decoder values.

Suggested-by: Thilo Borgmann
8 years agoalsdec.c: Simplify error check before calling rice decoder.
Carl Eugen Hoyos [Sat, 5 May 2012 11:14:36 +0000 (13:14 +0200)]
alsdec.c: Simplify error check before calling rice decoder.

Reviewed-by: Thilo Borgmann
8 years agovsrc_buffer: return EAGAIN if no frame is available.
Nicolas George [Tue, 17 Apr 2012 16:31:25 +0000 (18:31 +0200)]
vsrc_buffer: return EAGAIN if no frame is available.

This is not an erroneous condition, do not print a warning.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoWMAL: Shift output samples by the specified number of padding zeroes.
Jakub Stachowski [Thu, 3 May 2012 17:36:48 +0000 (19:36 +0200)]
WMAL: Shift output samples by the specified number of padding zeroes.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
8 years agoWMAL: Restore removed code in mclms_predict()
Mashiat Sarker Shakkhar [Thu, 3 May 2012 17:14:47 +0000 (10:14 -0700)]
WMAL: Restore removed code in mclms_predict()

Based on observations made by Jakub Stachowski <qbast@go2.pl>

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>