ffmpeg.git
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 30 Jan 2012 04:20:58 +0000 (05:20 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  png: add missing #if HAVE_SSSE3 around function pointer assignment.
  imdct36: mark SSE functions as using all 16 XMM registers.
  png: move DSP functions to their own DSP context.
  sunrast: Add a sample request for TIFF, IFF, and Experimental Rastfile formats.
  sunrast: Cosmetics
  sunrast: Remove if (unsigned int < 0) check.
  sunrast: Replace magic number by a macro.

Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/pngdec.c
libavcodec/sunrast.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: configure: Restore alphabetical order for CMDLINE_SET
Alexander Strasser [Sun, 29 Jan 2012 21:56:12 +0000 (22:56 +0100)]
build: configure: Restore alphabetical order for CMDLINE_SET

7 years agoFix offset validity checks.
Reimar Döffinger [Sun, 29 Jan 2012 17:16:23 +0000 (18:16 +0100)]
Fix offset validity checks.

Offsets are relative to the end of the header, not the
start of the buffer, thus the buffer size needs to be subtracted.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agofraps: frame threading support.
Reimar Döffinger [Sun, 29 Jan 2012 13:59:32 +0000 (14:59 +0100)]
fraps: frame threading support.

Codec is too simple to gain much from it at lower resolutions,
but should help at very high resolutions, particularly for
v3 and v5 where a not too optimized pseudo-YUV to RGB
is done in the codec.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agofraps: Deduplicate some code.
Reimar Döffinger [Sun, 29 Jan 2012 13:43:28 +0000 (14:43 +0100)]
fraps: Deduplicate some code.

Also moves it before the get_buffer call so that most error exits
happen before it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agofraps: Minor simplification, use local variable.
Reimar Döffinger [Sun, 29 Jan 2012 13:50:58 +0000 (14:50 +0100)]
fraps: Minor simplification, use local variable.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agopng: add missing #if HAVE_SSSE3 around function pointer assignment.
Ronald S. Bultje [Sun, 29 Jan 2012 20:31:59 +0000 (12:31 -0800)]
png: add missing #if HAVE_SSSE3 around function pointer assignment.

7 years agor210enc: don't write uninitialized data
Paul B Mahol [Sun, 29 Jan 2012 19:03:04 +0000 (19:03 +0000)]
r210enc: don't write uninitialized data

Also fix r210 fate decoding test.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add v308 encoding/decoding test
Paul B Mahol [Sun, 29 Jan 2012 13:18:59 +0000 (13:18 +0000)]
fate: add v308 encoding/decoding test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibvpxenc: update after FF_API_X264_GLOBAL_OPTS removal
Paul B Mahol [Sun, 29 Jan 2012 15:05:10 +0000 (15:05 +0000)]
libvpxenc: update after FF_API_X264_GLOBAL_OPTS removal

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add yuv4 encoding/decoding test
Paul B Mahol [Sun, 29 Jan 2012 12:00:56 +0000 (12:00 +0000)]
fate: add yuv4 encoding/decoding test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobintext: use private options now that AVFormatParameters has been removed
Peter Ross [Sun, 29 Jan 2012 01:12:57 +0000 (12:12 +1100)]
bintext: use private options now that AVFormatParameters has been removed

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoImprove decoding quality for lossy wavpack.
Carl Eugen Hoyos [Sun, 29 Jan 2012 16:50:17 +0000 (17:50 +0100)]
Improve decoding quality for lossy wavpack.

This reverts e6e7bfc1 and 365e1ec2.
The code may be incorrect both before and after the revert, but we
do not have any samples that were fixed by the original commits.

Fixes ticket #871.

7 years agofraps: optimize pseudo-YUV to RGB conversion.
Reimar Döffinger [Sun, 29 Jan 2012 14:40:48 +0000 (15:40 +0100)]
fraps: optimize pseudo-YUV to RGB conversion.

With gcc 4.6 this part of the code is ca. 4x faster, resulting
in an overall speedup of around 5% for fate-fraps-v5 sample.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoimdct36: mark SSE functions as using all 16 XMM registers.
Ronald S. Bultje [Sun, 29 Jan 2012 16:14:05 +0000 (08:14 -0800)]
imdct36: mark SSE functions as using all 16 XMM registers.

On x86-64, it indeed uses all 16 registers (and on x86-32, this gets
clipped to 8). Not marking it properly causes callers of this function
to fail randomly because of XMM register clobbering.

7 years agopng: move DSP functions to their own DSP context.
Ronald S. Bultje [Fri, 27 Jan 2012 15:00:36 +0000 (23:00 +0800)]
png: move DSP functions to their own DSP context.

7 years agosunrast: Add a sample request for TIFF, IFF, and Experimental Rastfile formats.
Aneesh Dogra [Sat, 28 Jan 2012 13:04:15 +0000 (18:34 +0530)]
sunrast: Add a sample request for TIFF, IFF, and Experimental Rastfile formats.

Signed-off-by: Aneesh Dogra <lionaneesh@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agosunrast: Cosmetics
Aneesh Dogra [Sat, 28 Jan 2012 13:04:14 +0000 (18:34 +0530)]
sunrast: Cosmetics

Signed-off-by: Aneesh Dogra <lionaneesh@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agosunrast: Remove if (unsigned int < 0) check.
Aneesh Dogra [Sun, 29 Jan 2012 05:25:32 +0000 (10:55 +0530)]
sunrast: Remove if (unsigned int < 0) check.

Note: This fixes the following GCC warning :-
libavcodec/sunrast.c:94: warning: comparison of unsigned expression < 0 is always false.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agosunrast: Replace magic number by a macro.
Aneesh Dogra [Sat, 28 Jan 2012 13:04:12 +0000 (18:34 +0530)]
sunrast: Replace magic number by a macro.

Signed-off-by: Aneesh Dogra <lionaneesh@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoFix dvb subtitle decoding when display segment is missing.
Paul Kendall [Sun, 29 Jan 2012 13:50:19 +0000 (14:50 +0100)]
Fix dvb subtitle decoding when display segment is missing.

7 years agofraps: Add release_buffer forgotten when reget_buffer was removed.
Reimar Döffinger [Sun, 29 Jan 2012 13:47:36 +0000 (14:47 +0100)]
fraps: Add release_buffer forgotten when reget_buffer was removed.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agofraps: fix indentation.
Reimar Döffinger [Sun, 29 Jan 2012 13:21:36 +0000 (14:21 +0100)]
fraps: fix indentation.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoFRAPS: Do not needlessly use reget_buffer.
Reimar Döffinger [Sat, 28 Jan 2012 22:07:54 +0000 (23:07 +0100)]
FRAPS: Do not needlessly use reget_buffer.

Codec has only I- and skip-frames, so there is no
need for reget_buffer, change it so it works with
get_buffer.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoFallback to input timestamps for non-delay encoders.
Reimar Döffinger [Sun, 22 Jan 2012 10:23:47 +0000 (11:23 +0100)]
Fallback to input timestamps for non-delay encoders.

Causes FFmpeg to pass through the correct pts values,
instead of clobbering all to AV_NOPTS_VALUE (the av_init_packet
default) to then make up new ones based on only fps when muxing.
Included are also the related FATE ref changes, which all
some reasonable on quick investigation.
Also set all H.264 references to us -vsync drop to reduce the
diff for the ref files.
Otherwise almost all H.264 references need to change, mostly due
to now starting with negative pts values.
About 20 additional H.264 conformance tests needed -vsync
drop anyway because they create pts values that are out of
order and thus not possible to mux otherwise.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agofate: fix r210 test on big endian
Paul B Mahol [Sun, 29 Jan 2012 02:37:11 +0000 (02:37 +0000)]
fate: fix r210 test on big endian

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add R210 encoding/decoding test
Paul B Mahol [Sun, 29 Jan 2012 00:32:30 +0000 (00:32 +0000)]
fate: add R210 encoding/decoding test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agor210enc: fix encoding for unaligned widths
Paul B Mahol [Sun, 29 Jan 2012 00:32:16 +0000 (00:32 +0000)]
r210enc: fix encoding for unaligned widths

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add Y41P encoding/decoding test
Paul B Mahol [Sun, 29 Jan 2012 00:31:17 +0000 (00:31 +0000)]
fate: add Y41P encoding/decoding test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 28 Jan 2012 23:34:59 +0000 (00:34 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacenc: Fix LONG_START windowing.
  aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.
  avplay: use the correct array size for stride.
  lavc: extend doxy for avcodec_alloc_context3().
  APIchanges: mention avcodec_alloc_context()/2/3
  avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.
  aacsbr: ARM NEON optimised sbrdsp functions
  aacsbr: align some arrays
  aacsbr: move some simdable loops to function pointers
  cosmetics: Remove extra newlines at EOF

Conflicts:
libavcodec/utils.c
libavfilter/formats.c
libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorawenc: initialize coded_frame via avcodec_get_frame_defaults.
Reimar Döffinger [Sat, 28 Jan 2012 21:04:22 +0000 (22:04 +0100)]
rawenc: initialize coded_frame via avcodec_get_frame_defaults.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agolibgsm: Fix compilation.
Reimar Döffinger [Sat, 28 Jan 2012 22:15:02 +0000 (23:15 +0100)]
libgsm: Fix compilation.

Move libgsm_encode_close before its first use and call it
with the correct number of arguments.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agov210x: check for return value of avcodec_alloc_frame()
Paul B Mahol [Sat, 28 Jan 2012 20:27:35 +0000 (20:27 +0000)]
v210x: check for return value of avcodec_alloc_frame()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agov210enc: remove redundant assignment
Paul B Mahol [Sat, 28 Jan 2012 20:27:17 +0000 (20:27 +0000)]
v210enc: remove redundant assignment

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agov210enc: check return value of avcodec_alloc_frame()
Paul B Mahol [Sat, 28 Jan 2012 20:27:17 +0000 (20:27 +0000)]
v210enc: check return value of avcodec_alloc_frame()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agov210dec: check return value of avcodec_alloc_frame()
Paul B Mahol [Sat, 28 Jan 2012 20:25:59 +0000 (20:25 +0000)]
v210dec: check return value of avcodec_alloc_frame()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoroqaudioenc: check return value of avcodec_alloc_frame()
Paul B Mahol [Sat, 28 Jan 2012 20:12:43 +0000 (20:12 +0000)]
roqaudioenc: check return value of avcodec_alloc_frame()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoroqaudioenc: remove redundant assignment
Paul B Mahol [Sat, 28 Jan 2012 20:12:43 +0000 (20:12 +0000)]
roqaudioenc: remove redundant assignment

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agor210dec: check return value of avcodec_alloc_frame()
Paul B Mahol [Sat, 28 Jan 2012 20:09:05 +0000 (20:09 +0000)]
r210dec: check return value of avcodec_alloc_frame()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopcm: remove redundant assignment
Paul B Mahol [Sat, 28 Jan 2012 20:06:36 +0000 (20:06 +0000)]
pcm: remove redundant assignment

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopcm: check return value of avcodec_alloc_frame()
Paul B Mahol [Sat, 28 Jan 2012 20:06:36 +0000 (20:06 +0000)]
pcm: check return value of avcodec_alloc_frame()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibopencore-amr: fix memleak
Paul B Mahol [Sat, 28 Jan 2012 20:01:09 +0000 (20:01 +0000)]
libopencore-amr: fix memleak

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibopencore-amr: check return value of avcodec_alloc_frame()
Paul B Mahol [Sat, 28 Jan 2012 20:01:09 +0000 (20:01 +0000)]
libopencore-amr: check return value of avcodec_alloc_frame()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmp3lame: remove dupe assigment
Paul B Mahol [Sat, 28 Jan 2012 19:55:47 +0000 (19:55 +0000)]
libmp3lame: remove dupe assigment

It is already done by avcodec_alloc_context().

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibgsm: remove dupe assigment.
Paul B Mahol [Sat, 28 Jan 2012 19:46:47 +0000 (19:46 +0000)]
libgsm: remove dupe assigment.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibgsm: check return value of gsm_create & avcodec_alloc_frame()
Paul B Mahol [Sat, 28 Jan 2012 19:46:47 +0000 (19:46 +0000)]
libgsm: check return value of gsm_create & avcodec_alloc_frame()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaacenc: Fix LONG_START windowing.
Nathan Caldwell [Sat, 28 Jan 2012 05:23:41 +0000 (22:23 -0700)]
aacenc: Fix LONG_START windowing.

Forgot to add the equivalent amount to the incoming sample pointer as the output pointer.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoaacenc: Fix a bug where deinterleaved samples were stored in the wrong place.
Nathan Caldwell [Sat, 28 Jan 2012 05:23:40 +0000 (22:23 -0700)]
aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.

10l: Forgot to adjust deinterleave for new location of incoming samples in 7946a5a.

This produced incorrect, but surprisingly listenable results.

Thanks to Justin Ruggles for the report.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoAdd -vsync drop.
Reimar Döffinger [Sat, 28 Jan 2012 18:56:13 +0000 (19:56 +0100)]
Add -vsync drop.

This allows to work around any non-monotonic time-stamp errors
by just discarding all time stamps.
This will be necessary to allow H.264 conformance tests to pass
after fixing time stamps to be passed through rawenc.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoCompare video_sync_method against the appropriate defines.
Reimar Döffinger [Sat, 28 Jan 2012 18:48:17 +0000 (19:48 +0100)]
Compare video_sync_method against the appropriate defines.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoDemux all parts of concatenated H.264.
Reimar Döffinger [Sat, 21 Jan 2012 10:11:57 +0000 (11:11 +0100)]
Demux all parts of concatenated H.264.

We may or may not be able to play the latter parts
but not demuxing at all seems like the worst possible behaviour.
Fixes playback of e.g.
http://playlist.yahoo.com/makeplaylist.dll?sid=128114687&sdm=web&pt=rd
As a proper solution either multiple video streams should
be exported or side data should be used to update extradata
if necessary.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoSet AVFMT_TS_NONSTRICT for framecrc muxer.
Reimar Döffinger [Sun, 22 Jan 2012 16:35:41 +0000 (17:35 +0100)]
Set AVFMT_TS_NONSTRICT for framecrc muxer.

Since it is set for e.g. webm muxer we should make it possible
to test such streams with framecrc, too.
Though the primary reason is that this allows the H.264 tests
to not run into this check when fixing raw video encode to
pass pts values on.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoRemove unnecessary -vsync 0.
Reimar Döffinger [Sun, 22 Jan 2012 13:02:18 +0000 (14:02 +0100)]
Remove unnecessary -vsync 0.

The tests work fine without it, and it will cause issues when the
rawvideo decoder is changed to properly handle pts values.
The H.264 conformance tests however are still broken, usually losing
the first frames without it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoMerge palette-only header with actual video frame.
Reimar Döffinger [Sun, 22 Jan 2012 12:17:53 +0000 (13:17 +0100)]
Merge palette-only header with actual video frame.

This fixes the video frame pts (off by one for each MVIh)
and makes the "key frames" decode stand-alone (MVIh
contains only palette, such a palette-only frame being
marked as key frame is not really correct).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoDFA: fix "skip frame" TSW1 encoding.
Reimar Döffinger [Sun, 22 Jan 2012 11:41:12 +0000 (12:41 +0100)]
DFA: fix "skip frame" TSW1 encoding.

Previously the decoder would raise an error.
The end result is the same, the time stamps only change
because regression tests create time stamps incorrectly.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoadpcmenc: refactor some code.
Paul B Mahol [Sat, 28 Jan 2012 19:06:08 +0000 (19:06 +0000)]
adpcmenc: refactor some code.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadpcmenc: check return value of avcodec_alloc_frame()
Paul B Mahol [Sat, 28 Jan 2012 19:06:08 +0000 (19:06 +0000)]
adpcmenc: check return value of avcodec_alloc_frame()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadxenc: check return value of avcodec_alloc_frame()
Paul B Mahol [Sat, 28 Jan 2012 19:06:44 +0000 (19:06 +0000)]
adxenc: check return value of avcodec_alloc_frame()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoac3enc: check return value of avcodec_alloc_frame()
Paul B Mahol [Sat, 28 Jan 2012 19:04:35 +0000 (19:04 +0000)]
ac3enc: check return value of avcodec_alloc_frame()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexample: Update decoding/encoding example to the new API.
Michael Niedermayer [Sat, 28 Jan 2012 07:28:05 +0000 (08:28 +0100)]
example: Update decoding/encoding example to the new API.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexample: update muxing example to purple API
Michael Niedermayer [Sat, 28 Jan 2012 07:28:44 +0000 (08:28 +0100)]
example: update muxing example to purple API

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavplay: use the correct array size for stride.
Anton Khirnov [Sat, 28 Jan 2012 18:30:30 +0000 (19:30 +0100)]
avplay: use the correct array size for stride.

AV_NUM_DATA_POINTERS instead of 4.

7 years agolavc: extend doxy for avcodec_alloc_context3().
Anton Khirnov [Sat, 28 Jan 2012 08:08:42 +0000 (09:08 +0100)]
lavc: extend doxy for avcodec_alloc_context3().

7 years agoAPIchanges: mention avcodec_alloc_context()/2/3
Anton Khirnov [Sat, 28 Jan 2012 08:05:55 +0000 (09:05 +0100)]
APIchanges: mention avcodec_alloc_context()/2/3

There was no minor bump for making avcodec_alloc_context3() public and
deprecating the other two, so I'm using the first next lavc bump.

7 years agoavcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.
Anton Khirnov [Sat, 28 Jan 2012 07:46:22 +0000 (08:46 +0100)]
avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.

This function is video-only, so there's no point in setting more
linesizes.

Fixes stack corruption in avplay.

7 years agoswscale: fix conversion into yuva444p from non-alpha formats
Paul B Mahol [Sat, 28 Jan 2012 03:12:29 +0000 (03:12 +0000)]
swscale: fix conversion into yuva444p from non-alpha formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyuv2rgb: better check if source format have alpha
Paul B Mahol [Sat, 28 Jan 2012 03:02:32 +0000 (03:02 +0000)]
yuv2rgb: better check if source format have alpha

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaacsbr: ARM NEON optimised sbrdsp functions
Mans Rullgard [Thu, 12 Jan 2012 23:44:20 +0000 (23:44 +0000)]
aacsbr: ARM NEON optimised sbrdsp functions

Overall speedup of HE-AAC decoding 2.3x on Cortex-A8, 1.2x on A9.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoaacsbr: align some arrays
Mans Rullgard [Fri, 13 Jan 2012 14:31:18 +0000 (14:31 +0000)]
aacsbr: align some arrays

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoaacsbr: move some simdable loops to function pointers
Mans Rullgard [Thu, 12 Jan 2012 00:17:45 +0000 (00:17 +0000)]
aacsbr: move some simdable loops to function pointers

This prepares for assembly optimisations by moving the most
time-consuming loops to functions called through pointers
in a new context.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agocmdutils: re-add return 0 accidentally remove from opt_protocols().
Clément Bœsch [Sat, 28 Jan 2012 11:36:38 +0000 (12:36 +0100)]
cmdutils: re-add return 0 accidentally remove from opt_protocols().

7 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.

7 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>
7 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>
7 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>
7 years agocosmetics: Remove extra newlines at EOF
Alex Converse [Fri, 27 Jan 2012 18:36:35 +0000 (10:36 -0800)]
cosmetics: Remove extra newlines at EOF

7 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>
7 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>
7 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>
7 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

7 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>
7 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>
7 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>
7 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>
7 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>
7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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