]> git.sesse.net Git - ffmpeg/log
ffmpeg
12 years agoavfiltergraph: improve pick_format()
Michael Niedermayer [Wed, 9 May 2012 23:32:51 +0000 (01:32 +0200)]
avfiltergraph: improve pick_format()

without this the recent changes to format/sink handling would cause a regression in fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 10 May 2012 00:14:44 +0000 (02:14 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (27 commits)
  libxvid: Give more suitable names to libxvid-related files.
  libxvid: Separate libxvid encoder from libxvid rate control code.
  jpeglsdec: Remove write-only variable in ff_jpegls_decode_lse().
  fate: cosmetics: lowercase some comments
  fate: Give more consistent names to some RealVideo/RealAudio tests.
  lavfi: add avfilter_get_audio_buffer_ref_from_arrays().
  lavfi: add extended_data to AVFilterBuffer.
  lavc: check that extended_data is properly set in avcodec_encode_audio2().
  lavc: pad last audio frame with silence when needed.
  samplefmt: add a function for filling a buffer with silence.
  samplefmt: add a function for copying audio samples.
  lavr: do not try to copy to uninitialized output audio data.
  lavr: make avresample_read() with NULL output discard samples.
  fate: split idroq audio and video into separate tests
  fate: improve dependencies
  fate: add convenient shorthands for ea-vp6, libavcodec, libavutil tests
  fate: split some combined tests into separate audio and video tests
  fate: fix dependencies for probe tests
  mips: intreadwrite: fix inline asm for gcc 4.8
  mips: intreadwrite: remove unnecessary inline asm
  ...

Conflicts:
cmdutils.h
configure
doc/APIchanges
doc/filters.texi
ffmpeg.c
ffplay.c
libavcodec/internal.h
libavcodec/jpeglsdec.c
libavcodec/libschroedingerdec.c
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
libavcodec/utils.c
libavcodec/version.h
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.h
tests/Makefile
tests/fate/aac.mak
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/image.mak
tests/fate/libavutil.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/qt.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/vqf.mak
tests/ref/fate/ea-mad
tests/ref/fate/ea-tqi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoAdd tools/ffeval to .gitignore.
Clément Bœsch [Wed, 9 May 2012 22:07:20 +0000 (00:07 +0200)]
Add tools/ffeval to .gitignore.

12 years agoffmpeg: fix frame duration used for video sync.
Michael Niedermayer [Wed, 9 May 2012 16:15:03 +0000 (18:15 +0200)]
ffmpeg: fix frame duration used for video sync.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agosrc_buffer: ifdef->if CONFIG_*
Michael Niedermayer [Sat, 5 May 2012 00:49:10 +0000 (02:49 +0200)]
src_buffer: ifdef->if CONFIG_*

Reviewed-by: Stefano
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolibxvid: Give more suitable names to libxvid-related files.
Diego Biurrun [Wed, 9 May 2012 15:20:36 +0000 (17:20 +0200)]
libxvid: Give more suitable names to libxvid-related files.

12 years agolibxvid: Separate libxvid encoder from libxvid rate control code.
Diego Biurrun [Tue, 10 Apr 2012 23:11:08 +0000 (01:11 +0200)]
libxvid: Separate libxvid encoder from libxvid rate control code.

This allows compiling the Xvid rate control code without the encoder.

12 years agojpeglsdec: Remove write-only variable in ff_jpegls_decode_lse().
Diego Biurrun [Thu, 19 Apr 2012 12:55:49 +0000 (14:55 +0200)]
jpeglsdec: Remove write-only variable in ff_jpegls_decode_lse().

libavcodec/jpeglsdec.c:54:9: warning: variable ‘len’ set but not used

12 years agofate: cosmetics: lowercase some comments
Diego Biurrun [Thu, 26 Apr 2012 13:04:20 +0000 (15:04 +0200)]
fate: cosmetics: lowercase some comments

12 years agofate: Give more consistent names to some RealVideo/RealAudio tests.
Diego Biurrun [Thu, 26 Apr 2012 12:55:37 +0000 (14:55 +0200)]
fate: Give more consistent names to some RealVideo/RealAudio tests.

12 years agolavfi: add avfilter_get_audio_buffer_ref_from_arrays().
Stefano Sabatini [Sun, 30 Jan 2011 23:07:41 +0000 (00:07 +0100)]
lavfi: add avfilter_get_audio_buffer_ref_from_arrays().

Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agolavfi: add extended_data to AVFilterBuffer.
Anton Khirnov [Mon, 16 Apr 2012 12:01:26 +0000 (14:01 +0200)]
lavfi: add extended_data to AVFilterBuffer.

This is similar to what has previously been done in AVFrame to allow
dealing with more than 8 channels.

12 years agolavc: check that extended_data is properly set in avcodec_encode_audio2().
Anton Khirnov [Mon, 7 May 2012 14:56:20 +0000 (16:56 +0200)]
lavc: check that extended_data is properly set in avcodec_encode_audio2().

12 years agolavc: pad last audio frame with silence when needed.
Anton Khirnov [Mon, 7 May 2012 11:55:03 +0000 (13:55 +0200)]
lavc: pad last audio frame with silence when needed.

12 years agosamplefmt: add a function for filling a buffer with silence.
Anton Khirnov [Tue, 8 May 2012 11:56:37 +0000 (13:56 +0200)]
samplefmt: add a function for filling a buffer with silence.

12 years agosamplefmt: add a function for copying audio samples.
Anton Khirnov [Sun, 6 May 2012 12:10:38 +0000 (14:10 +0200)]
samplefmt: add a function for copying audio samples.

12 years agolavr: do not try to copy to uninitialized output audio data.
Anton Khirnov [Wed, 9 May 2012 04:36:29 +0000 (06:36 +0200)]
lavr: do not try to copy to uninitialized output audio data.

This would happen at least when lavr is used as a fifo with no
conversion.

12 years agolavr: make avresample_read() with NULL output discard samples.
Anton Khirnov [Wed, 9 May 2012 04:35:13 +0000 (06:35 +0200)]
lavr: make avresample_read() with NULL output discard samples.

12 years agofate: split idroq audio and video into separate tests
Mans Rullgard [Tue, 8 May 2012 23:59:40 +0000 (00:59 +0100)]
fate: split idroq audio and video into separate tests

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agofate: improve dependencies
Mans Rullgard [Tue, 8 May 2012 21:07:26 +0000 (22:07 +0100)]
fate: improve dependencies

This makes only tests actually using avconv depend on it.
The remaining tests already depend on what they need.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agofate: add convenient shorthands for ea-vp6, libavcodec, libavutil tests
Diego Biurrun [Thu, 26 Apr 2012 12:05:57 +0000 (12:05 +0000)]
fate: add convenient shorthands for ea-vp6, libavcodec, libavutil tests

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agofate: split some combined tests into separate audio and video tests
Diego Biurrun [Fri, 27 Apr 2012 14:17:42 +0000 (14:17 +0000)]
fate: split some combined tests into separate audio and video tests

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agofate: fix dependencies for probe tests
Mans Rullgard [Tue, 8 May 2012 10:29:09 +0000 (11:29 +0100)]
fate: fix dependencies for probe tests

Only the probe tests should depend on avprobe and these should
be enabled only if avprobe is configured.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agomips: intreadwrite: fix inline asm for gcc 4.8
Mans Rullgard [Sat, 5 May 2012 22:38:15 +0000 (23:38 +0100)]
mips: intreadwrite: fix inline asm for gcc 4.8

Just like gcc 4.6 and later on ARM, gcc 4.8 on MIPS generates
inefficient code when a known-unaligned location is used as a
memory input operand.  This applies the same fix as has been
previously done to the ARM version of the code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agomips: intreadwrite: remove unnecessary inline asm
Mans Rullgard [Sat, 5 May 2012 22:24:51 +0000 (23:24 +0100)]
mips: intreadwrite: remove unnecessary inline asm

GCC actually handles unaligned accesses correctly in all cases
except, absurdly, 32-bit loads on mips64.  The remaining asm is
thus not needed, and removing it results in better code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agoFix lagarith YUY2 output.
Carl Eugen Hoyos [Wed, 9 May 2012 09:58:08 +0000 (11:58 +0200)]
Fix lagarith YUY2 output.

12 years agoerror: Try to make av_strerror() closer to binary identical across platforms.
Michael Niedermayer [Wed, 9 May 2012 09:26:11 +0000 (11:26 +0200)]
error: Try to make av_strerror() closer to binary identical across platforms.

This should fix the parseutils fate test.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavfi: add video buffer sink, and use it in avtools
Anton Khirnov [Fri, 27 Apr 2012 04:56:56 +0000 (06:56 +0200)]
lavfi: add video buffer sink, and use it in avtools

Also add the public interface libavfilter/buffersink.h.

Based on a commit by Stefano Sabatini.

12 years agolavfi: add a function for copying properties from AVFilterBufferRef->AVFrame
Anton Khirnov [Fri, 27 Apr 2012 15:27:40 +0000 (17:27 +0200)]
lavfi: add a function for copying properties from AVFilterBufferRef->AVFrame

Based on a commit by Stefano Sabatini <stefano.sabatini-lala@poste.it>

12 years agoparseutils: use strings instead of integers for error codes.
Michael Niedermayer [Wed, 9 May 2012 00:53:42 +0000 (02:53 +0200)]
parseutils: use strings instead of integers for error codes.

error values can differ between platforms.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoparseutils: fix ;/, error
Michael Niedermayer [Wed, 9 May 2012 00:52:57 +0000 (02:52 +0200)]
parseutils: fix ;/, error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agosctp: Initial tcp-alike sctp support with streams
Luca Barbato [Sat, 21 Apr 2012 12:03:05 +0000 (14:03 +0200)]
sctp: Initial tcp-alike sctp support with streams

Signed-off-by: Jordi Ortiz <nenjordi@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years agolibschroedingerdec: Change AVPicture to AVFrame and use SchroTag to store pts
Jordi Ortiz [Tue, 8 May 2012 17:20:32 +0000 (19:20 +0200)]
libschroedingerdec: Change AVPicture to AVFrame and use SchroTag to store pts

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years agoqdm2: print error messages instead of just retunring failures
Michael Niedermayer [Tue, 8 May 2012 21:09:45 +0000 (23:09 +0200)]
qdm2: print error messages instead of just retunring failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoCSCD: must use reget_buffer.
Reimar Döffinger [Tue, 8 May 2012 17:20:39 +0000 (19:20 +0200)]
CSCD: must use reget_buffer.

Using release_buffer and get_buffer as currently might
not prefer the previous frame contents which the
decoder relies on.
This leads to horrible playback in players using direct
rendering like MPlayer.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agog723_1: change to encode2()
Michael Niedermayer [Tue, 8 May 2012 19:45:16 +0000 (21:45 +0200)]
g723_1: change to encode2()

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

* qatar/master:
  rtmp: Support 'rtmp_live', an option which specifies if the media is a live stream.
  av_samples_fill_array: Mark unmodified function argument as const.
  lagarith: add YUY2 decoding support
  Support decoding unaligned rgb24 lagarith.
  dv: Split profile handling code into a separate file.
  flvenc: use AVFormatContext, not AVCodecContext for logging.
  mov: Remove write-only variable in mov_read_chan().
  fate: Change the probe-format refs to match the final text format committed.
  fate: Add avprobe as a make dependency
  Add probe fate tests to test for regressions in detecting media types.
  fate: Add oneline comparison method
  qdm2: clip array indices returned by qdm2_get_vlc().
  avplay: properly close/reopen AVAudioResampleContext on channel layout change
  avcodec: do not needlessly set packet size to 0 in avcodec_encode_audio2()
  avcodec: for audio encoding, reset output packet when it is not valid
  avcodec: refactor avcodec_encode_audio2() to merge common branches
  avcodec: remove fallbacks for AVCodec.encode() in avcodec_encode_audio2()

Conflicts:
ffplay.c
libavcodec/Makefile
libavcodec/dvdata.c
libavcodec/dvdata.h
libavcodec/qdm2.c
libavcodec/utils.c
libavformat/flvenc.c
libavformat/mov.c
tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoshorten: increase max_frame_size.
Michael Niedermayer [Tue, 8 May 2012 16:52:18 +0000 (18:52 +0200)]
shorten: increase max_frame_size.

Fixes Ticket1250

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodoc/examples/Makefile: split lines up to make diffs that change them clearer
Michael Niedermayer [Tue, 8 May 2012 16:22:28 +0000 (18:22 +0200)]
doc/examples/Makefile: split lines up to make diffs that change them clearer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agooptions_table: Add some missing #includes to fix "make checkheaders".
Alex Converse [Mon, 7 May 2012 23:25:12 +0000 (16:25 -0700)]
options_table: Add some missing #includes to fix "make checkheaders".

Signed-off-by: Diego Biurrun <diego@biurrun.de>
12 years agodoc: Replace a stray reference to the old '-intra' flag.
Alex Converse [Mon, 7 May 2012 18:57:11 +0000 (11:57 -0700)]
doc: Replace a stray reference to the old '-intra' flag.

12 years agosrc_buffer: move code to avoid forward declarations.
Nicolas George [Sun, 6 May 2012 19:30:49 +0000 (21:30 +0200)]
src_buffer: move code to avoid forward declarations.

12 years agortsp: Add content-type message header parsing
Jordi Ortiz [Fri, 4 May 2012 15:50:31 +0000 (17:50 +0200)]
rtsp: Add content-type message header parsing

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years agoyuv4mpeg: support 9/10/16 bit pixel formats
Jean First [Mon, 7 May 2012 21:14:27 +0000 (23:14 +0200)]
yuv4mpeg: support 9/10/16 bit pixel formats

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoaasc: use the correct reader offset
Michael Niedermayer [Tue, 8 May 2012 13:18:33 +0000 (15:18 +0200)]
aasc: use the correct reader offset

Fixes Ticket1232

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agortmp: Support 'rtmp_live', an option which specifies if the media is a live stream.
Samuel Pitoiset [Sat, 5 May 2012 17:33:26 +0000 (19:33 +0200)]
rtmp: Support 'rtmp_live', an option which specifies if the media is a live stream.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoav_samples_fill_array: Mark unmodified function argument as const.
Diego Biurrun [Wed, 11 Apr 2012 12:51:57 +0000 (14:51 +0200)]
av_samples_fill_array: Mark unmodified function argument as const.

libavcodec/utils.c:274: warning: passing argument 3 of ‘av_samples_fill_arrays’ discards qualifiers from pointer target type
./libavutil/samplefmt.h:151: note: expected ‘uint8_t *’ but argument is of type ‘const uint8_t *’

12 years agoWrite palettised targa.
Carl Eugen Hoyos [Tue, 8 May 2012 09:02:12 +0000 (11:02 +0200)]
Write palettised targa.

Fixes ticket #1190.

Reviewed-by: Paul B Mahol
12 years agoSupport yuva422p rawvideo in nut.
Carl Eugen Hoyos [Tue, 8 May 2012 08:37:13 +0000 (10:37 +0200)]
Support yuva422p rawvideo in nut.

12 years agoAdd yuva422p to yadif format list.
Carl Eugen Hoyos [Tue, 8 May 2012 08:36:47 +0000 (10:36 +0200)]
Add yuva422p to yadif format list.

12 years agoSupport yuva422p in ffv1.
Carl Eugen Hoyos [Tue, 8 May 2012 06:49:36 +0000 (08:49 +0200)]
Support yuva422p in ffv1.

12 years agoAdd Avid Meridien (AVUI) decoder.
Carl Eugen Hoyos [Tue, 8 May 2012 06:41:26 +0000 (08:41 +0200)]
Add Avid Meridien (AVUI) decoder.

12 years agoAdd yuva422p pix_fmt.
Carl Eugen Hoyos [Tue, 8 May 2012 06:39:37 +0000 (08:39 +0200)]
Add yuva422p pix_fmt.

12 years agolagarith: add YUY2 decoding support
Kostya Shishkov [Mon, 7 May 2012 17:43:52 +0000 (19:43 +0200)]
lagarith: add YUY2 decoding support

Unlike other variants, for YUY2 we need to use different prediction:
* on line 0 for luma we should left predict starting from the second pixel
* on line 1 we should left predict first 4 pixels for luma and 2 for chroma
* median prediction employed here is taken directly from HuffYUV

12 years agoSupport decoding unaligned rgb24 lagarith.
Carl Eugen Hoyos [Tue, 8 May 2012 04:25:53 +0000 (22:25 -0600)]
Support decoding unaligned rgb24 lagarith.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
12 years agomp3demux: fix id3 discard code
Michael Niedermayer [Tue, 8 May 2012 01:47:58 +0000 (03:47 +0200)]
mp3demux: fix id3 discard code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 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>
12 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>
12 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>
12 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>
12 years agodv: Split profile handling code into a separate file.
Diego Biurrun [Wed, 18 Apr 2012 15:55:49 +0000 (17:55 +0200)]
dv: Split profile handling code into a separate file.

12 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>
12 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>
12 years agoflvenc: use AVFormatContext, not AVCodecContext for logging.
Anton Khirnov [Mon, 7 May 2012 14:09:30 +0000 (16:09 +0200)]
flvenc: use AVFormatContext, not AVCodecContext for logging.

Encoder tag being used for muxer messages is confusing.

12 years agomov: Remove write-only variable in mov_read_chan().
Diego Biurrun [Thu, 19 Apr 2012 12:53:23 +0000 (14:53 +0200)]
mov: Remove write-only variable in mov_read_chan().

libavformat/mov.c:597:25: warning: variable ‘cflags’ set but not used

12 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>
12 years agofate: Change the probe-format refs to match the final text format committed.
Alex Converse [Mon, 7 May 2012 18:01:38 +0000 (11:01 -0700)]
fate: Change the probe-format refs to match the final text format committed.

12 years agofate: Add avprobe as a make dependency
Alex Converse [Mon, 7 May 2012 18:00:54 +0000 (11:00 -0700)]
fate: Add avprobe as a make dependency

12 years agoAdd probe fate tests to test for regressions in detecting media types.
Ronald S. Bultje [Thu, 3 May 2012 18:01:00 +0000 (11:01 -0700)]
Add probe fate tests to test for regressions in detecting media types.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
12 years agofate: Add oneline comparison method
Mans Rullgard [Thu, 3 May 2012 22:43:11 +0000 (15:43 -0700)]
fate: Add oneline comparison method

Signed-off-by: Alex Converse <alex.converse@gmail.com>
12 years agoqdm2: clip array indices returned by qdm2_get_vlc().
Ronald S. Bultje [Wed, 2 May 2012 16:12:46 +0000 (16:12 +0000)]
qdm2: clip array indices returned by qdm2_get_vlc().

Prevents subsequent overreads when these numbers are used as indices
in arrays.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 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>
12 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>
12 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>
12 years agoavplay: properly close/reopen AVAudioResampleContext on channel layout change
Justin Ruggles [Thu, 3 May 2012 22:57:02 +0000 (18:57 -0400)]
avplay: properly close/reopen AVAudioResampleContext on channel layout change

fixes Bug#280

12 years agoavcodec: do not needlessly set packet size to 0 in avcodec_encode_audio2()
Justin Ruggles [Wed, 21 Mar 2012 19:49:25 +0000 (15:49 -0400)]
avcodec: do not needlessly set packet size to 0 in avcodec_encode_audio2()

It is already set to 0 by av_free_packet()

12 years agoavcodec: for audio encoding, reset output packet when it is not valid
Justin Ruggles [Wed, 21 Mar 2012 19:47:12 +0000 (15:47 -0400)]
avcodec: for audio encoding, reset output packet when it is not valid

12 years agoavcodec: refactor avcodec_encode_audio2() to merge common branches
Justin Ruggles [Wed, 21 Mar 2012 19:36:25 +0000 (15:36 -0400)]
avcodec: refactor avcodec_encode_audio2() to merge common branches

12 years agoavcodec: remove fallbacks for AVCodec.encode() in avcodec_encode_audio2()
Justin Ruggles [Wed, 21 Mar 2012 19:28:00 +0000 (15:28 -0400)]
avcodec: remove fallbacks for AVCodec.encode() in avcodec_encode_audio2()

We no longer have any audio encoders using AVCodec.encode().

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

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

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

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

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

12 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

12 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

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

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

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

12 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>
12 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()

12 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>
12 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().

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

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