ffmpeg.git
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 26 Nov 2012 15:17:55 +0000 (16:17 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: avoid integer overflow in ff_compute_frame_duration()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5ae72f54532960cb9eae82a1c9e8d505106c022b'
Michael Niedermayer [Mon, 26 Nov 2012 15:09:46 +0000 (16:09 +0100)]
Merge commit '5ae72f54532960cb9eae82a1c9e8d505106c022b'

* commit '5ae72f54532960cb9eae82a1c9e8d505106c022b':
  flashsv: check for keyframe before using differential coding
  h264: enable low delay only if no delayed frames were seen
  x86: fix build without inline asm

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa'
Michael Niedermayer [Mon, 26 Nov 2012 14:15:02 +0000 (15:15 +0100)]
Merge commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa'

* commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa':
  aacdec: use float planar sample format for output

Conflicts:
libavcodec/aacdec.c
libavcodec/aacsbr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c'
Michael Niedermayer [Mon, 26 Nov 2012 13:24:14 +0000 (14:24 +0100)]
Merge commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c'

* commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c':
  lavc: clarify get_buffer() documentation
  mpegaudiodec: use planar sample format for output unless packed is requested
  x86: h264 qpel: use the correct number of utilized xmm regs in cglobal

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodsputil_mmx: ff_put_dirac_pixels depend now on yasm.
Michael Niedermayer [Mon, 26 Nov 2012 12:59:41 +0000 (13:59 +0100)]
dsputil_mmx: ff_put_dirac_pixels depend now on yasm.

Fix compile failure without yasm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoiff demuxer: don't bother checking bitmap compression type; iff decoder does this now
Peter Ross [Thu, 22 Nov 2012 09:42:37 +0000 (20:42 +1100)]
iff demuxer: don't bother checking bitmap compression type; iff decoder does this now

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
7 years agoiff decoder: reindent
Peter Ross [Sun, 25 Nov 2012 04:15:42 +0000 (15:15 +1100)]
iff decoder: reindent

Signed-off-by: Peter Ross <pross@xvid.org>
7 years agoiff decoder: merge iff ilbm and byterun1 decoders
Peter Ross [Thu, 22 Nov 2012 10:25:33 +0000 (21:25 +1100)]
iff decoder: merge iff ilbm and byterun1 decoders

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
7 years agodpx: perform width/height upgrade and av_image_check_size earlier to prevent segfault...
Peter Ross [Mon, 26 Nov 2012 11:45:07 +0000 (22:45 +1100)]
dpx: perform width/height upgrade and av_image_check_size earlier to prevent segfault on malformed input

Signed-off-by: Peter Ross <pross@xvid.org>
7 years agoav_get_audio_frame_duration: add ADPCM_AFC
Paul B Mahol [Mon, 26 Nov 2012 11:59:44 +0000 (11:59 +0000)]
av_get_audio_frame_duration: add ADPCM_AFC

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agodoc/general: improve AST description
Paul B Mahol [Mon, 26 Nov 2012 10:40:51 +0000 (10:40 +0000)]
doc/general: improve AST description

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavf: avoid integer overflow in ff_compute_frame_duration()
Janne Grunau [Fri, 23 Nov 2012 13:05:36 +0000 (14:05 +0100)]
lavf: avoid integer overflow in ff_compute_frame_duration()

Scaling the denominator instead of the numerator if it is too large
loses precision. Fixes an assert caused by a negative frame duration in
the fuzzed sample nasa-8s2.ts_s202310.

CC: libav-stable@libav.org
7 years agoflashsv: check for keyframe before using differential coding
Janne Grunau [Sat, 24 Nov 2012 14:50:03 +0000 (15:50 +0100)]
flashsv: check for keyframe before using differential coding

Fixes a segfault in te fuzzed sample resolutionchange.flv_s211713.

CC: libav-stable@libav.org
7 years agoh264: enable low delay only if no delayed frames were seen
Janne Grunau [Fri, 16 Nov 2012 13:31:09 +0000 (14:31 +0100)]
h264: enable low delay only if no delayed frames were seen

Dropping frames is undesirable but that is the only way by which the
decoder could return to low delay mode. Instead emit a warning and
continue with delayed frames.
Fixes a crash in fuzzed sample nasa-8s2.ts_s20033 caused by a larger
than expected has_b_frames value. Low delay keeps getting re-enabled
from a presumely broken SPS.

CC: libav-stable@libav.org
7 years agoffmpeg: fix swr filter_type for auto inserted aresample filters
Michael Niedermayer [Mon, 26 Nov 2012 03:06:19 +0000 (04:06 +0100)]
ffmpeg: fix swr filter_type for auto inserted aresample filters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: fix passing swresample options to the auto inserted swr
Michael Niedermayer [Fri, 23 Nov 2012 14:35:48 +0000 (15:35 +0100)]
ffmpeg: fix passing swresample options to the auto inserted swr

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfiltergraph: add aresample_swr_opts
Michael Niedermayer [Fri, 23 Nov 2012 14:33:47 +0000 (15:33 +0100)]
avfiltergraph: add aresample_swr_opts

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu: drop time redefinition as it causes some problems in some uncommon configurations.
Michael Niedermayer [Mon, 26 Nov 2012 01:22:39 +0000 (02:22 +0100)]
lavu: drop time redefinition as it causes some problems in some uncommon configurations.

Based-on: e96d90eed66a198566c409958432d282e1b03869
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 26 Nov 2012 01:04:02 +0000 (02:04 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  remove #defines to prevent use of discouraged external functions
  x86: h264: Convert 8-bit QPEL inline assembly to YASM

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: fix build without inline asm
Diego Biurrun [Mon, 26 Nov 2012 00:44:29 +0000 (01:44 +0100)]
x86: fix build without inline asm

The qpel functions referenced here are not related to h264 and should
thus never have been under CONFIG_H264QPEL.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoadpcm/thp: make use of ADPCMChannelStatus to store prev samples
Paul B Mahol [Sun, 25 Nov 2012 19:14:48 +0000 (19:14 +0000)]
adpcm/thp: make use of ADPCMChannelStatus to store prev samples

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoaacdec: use float planar sample format for output
Justin Ruggles [Sun, 14 Oct 2012 04:12:55 +0000 (00:12 -0400)]
aacdec: use float planar sample format for output

7 years agolavc: clarify get_buffer() documentation
Justin Ruggles [Sun, 25 Nov 2012 16:37:14 +0000 (11:37 -0500)]
lavc: clarify get_buffer() documentation

This is needed for the AAC decoder, which may need to call get_buffer()
more than once if the channel configuration changes.

7 years agompegaudiodec: use planar sample format for output unless packed is requested
Justin Ruggles [Mon, 27 Aug 2012 22:17:33 +0000 (18:17 -0400)]
mpegaudiodec: use planar sample format for output unless packed is requested

7 years agoMerge commit 'ad01ba6ceaea7d71c4b9887795523438689b5a96'
Michael Niedermayer [Sun, 25 Nov 2012 23:57:12 +0000 (00:57 +0100)]
Merge commit 'ad01ba6ceaea7d71c4b9887795523438689b5a96'

* commit 'ad01ba6ceaea7d71c4b9887795523438689b5a96':
  x86: h264: Remove 3dnow QPEL code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: h264 qpel: use the correct number of utilized xmm regs in cglobal
Justin Ruggles [Sun, 25 Nov 2012 21:11:57 +0000 (16:11 -0500)]
x86: h264 qpel: use the correct number of utilized xmm regs in cglobal

Fixes xmm register clobbering on win64.

7 years agoMerge commit '28c8e288fa0342fdef532a7522a4707bebf831cc'
Michael Niedermayer [Sun, 25 Nov 2012 23:43:45 +0000 (00:43 +0100)]
Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc'

* commit '28c8e288fa0342fdef532a7522a4707bebf831cc':
  x86: h264_chromamc: port to cpuflags
  yop: fix typo
  avconv: fix copying per-stream metadata.
  doc: avtools-common-opts: Fix terminology concerning metric prefixes
  configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge
  riff: Make ff_riff_tags static and move under appropriate #ifdef

Conflicts:
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/samplefmt: return the size of the allocated samples buffer at the next bump
Stefano Sabatini [Sun, 25 Nov 2012 19:23:32 +0000 (20:23 +0100)]
lavu/samplefmt: return the size of the allocated samples buffer at the next bump

Make the functions av_samples_fill_arrays, av_samples_alloc, and
avcodec_fill_audio_frame return a buffer size rather than 0 in case of
success. This will be enabled at the next libavutil major bump, in order
to preserve backward compatibility.

Returning the size allows to simplify the code, avoiding a few function
calls.

7 years agodoc/encoders: add a note for x264 options that use colon
Ivan Pozdeev [Sun, 25 Nov 2012 19:33:20 +0000 (23:33 +0400)]
doc/encoders: add a note for x264 options that use colon

Signed-off-by: Ivan Pozdeev <ivan_pozdeev@mail.ru>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agoSupport switching field order when decoding frwu.
Carl Eugen Hoyos [Sun, 25 Nov 2012 21:27:32 +0000 (22:27 +0100)]
Support switching field order when decoding frwu.

The binary encoder has a "switch field order" setting that
moves one line from the top to the bottom of the frame.

Fixes ticket #966.

7 years agoremove #defines to prevent use of discouraged external functions
Janne Grunau [Fri, 26 Oct 2012 18:26:29 +0000 (20:26 +0200)]
remove #defines to prevent use of discouraged external functions

Preventing the use of discouraged or 'insecure' external functions
through defines in an internal header is not a good solution. The
header is not guaranteed to be included universally which makes
overlooking bad use of said functions during review more likely.

There are cases were those functions either are the most straight
forward solution or even have to be used. Using malloc or free is
required if the allocation or release is done by other libraries.

7 years agoimc: flush decoder
Michael Niedermayer [Sun, 25 Nov 2012 21:48:18 +0000 (22:48 +0100)]
imc: flush decoder

Fixes Ticket1899

Based on code by ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotga: check palette size earlier.
Michael Niedermayer [Sun, 25 Nov 2012 21:30:22 +0000 (22:30 +0100)]
tga: check palette size earlier.

Fixes Ticket1895

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: h264: Convert 8-bit QPEL inline assembly to YASM
Daniel Kang [Sat, 13 Oct 2012 15:04:50 +0000 (10:04 -0500)]
x86: h264: Convert 8-bit QPEL inline assembly to YASM

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agolavc/utils: check return value of avcodec_fill_audio_frame() for < 0
Stefano Sabatini [Sun, 25 Nov 2012 18:47:54 +0000 (19:47 +0100)]
lavc/utils: check return value of avcodec_fill_audio_frame() for < 0

Assume that the value is always negative in case of error, as stated in
the docs, do not assume that the value cannot be != 0 in case of success.

7 years agox86: h264: Remove 3dnow QPEL code
Daniel Kang [Sat, 13 Oct 2012 15:04:49 +0000 (10:04 -0500)]
x86: h264: Remove 3dnow QPEL code

The only CPUs that have 3dnow and don't have mmxext are 12 years old.
Moreover, AMD has dropped 3dnow extensions from newer CPUs.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agolavu/opt: add support for reading pixel and sample format through av_get_int()
Stefano Sabatini [Sun, 25 Nov 2012 16:34:18 +0000 (17:34 +0100)]
lavu/opt: add support for reading pixel and sample format through av_get_int()

Simplify backward compatibility, when switching from AV_OPT_TYPE_INT to
AV_OPT_TYPE_SAMPLE/PIXEL_FMT.

7 years agodoc: add libswscale.texi and ffmpeg-scaler.texi files
Stefano Sabatini [Tue, 13 Nov 2012 22:49:09 +0000 (23:49 +0100)]
doc: add libswscale.texi and ffmpeg-scaler.texi files

7 years agompsmpeg4: use av_image_check_size
Peter Ross [Sun, 25 Nov 2012 02:21:06 +0000 (13:21 +1100)]
mpsmpeg4: use av_image_check_size

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavrndec: use av_image_check_size
Peter Ross [Sun, 25 Nov 2012 02:20:19 +0000 (13:20 +1100)]
avrndec: use av_image_check_size

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorawdec: use av_image_check_size
Peter Ross [Sun, 25 Nov 2012 02:20:00 +0000 (13:20 +1100)]
rawdec: use av_image_check_size

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/imgutils: add consistency checks to av_image_copy_plane()
Stefano Sabatini [Fri, 7 Sep 2012 22:31:41 +0000 (00:31 +0200)]
lavu/imgutils: add consistency checks to av_image_copy_plane()

Add assertions and abort in case of invalid |dst_linesize| < bytewidth or
|src_linesize| < bytewidth.

Avoid to silently corrupt memory.

7 years agox86: h264_chromamc: port to cpuflags
Diego Biurrun [Fri, 27 Jul 2012 12:25:46 +0000 (14:25 +0200)]
x86: h264_chromamc: port to cpuflags

7 years agoyop: fix typo
Paul B Mahol [Wed, 21 Nov 2012 20:15:02 +0000 (20:15 +0000)]
yop: fix typo

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoavconv: fix copying per-stream metadata.
Anton Khirnov [Sat, 24 Nov 2012 06:55:42 +0000 (07:55 +0100)]
avconv: fix copying per-stream metadata.

It is handled separately from other types because it uses stream
specifiers and currently that triggers an assert in SET_DICT.

CC:libav-stable@libav.org

7 years agolavu/opt: fix range shown in set_format() log message
Stefano Sabatini [Sun, 25 Nov 2012 14:49:50 +0000 (15:49 +0100)]
lavu/opt: fix range shown in set_format() log message

7 years agoconfigure: prefer "resampling" in the libswresample pkg-config description
Stefano Sabatini [Sat, 24 Nov 2012 23:35:04 +0000 (00:35 +0100)]
configure: prefer "resampling" in the libswresample pkg-config description

7 years agolavu/opt: add av_opt_ accessors for pixel/format/image size options
Stefano Sabatini [Sun, 4 Nov 2012 14:32:56 +0000 (15:32 +0100)]
lavu/opt: add av_opt_ accessors for pixel/format/image size options

The interface is implemented against the style of the other options
accessors. Possibly simplify programmatic setting of options.

7 years agoiff decoder: initialise HAM line decoder with first palette entry
Peter Ross [Sun, 25 Nov 2012 11:04:11 +0000 (22:04 +1100)]
iff decoder: initialise HAM line decoder with first palette entry

The palette is organised into 'hold' and 'modify' pairs, hence why
the first palette entry is pal[1].

Fixes ticket #1701.

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfiltergraph: add AVOption table
Michael Niedermayer [Fri, 23 Nov 2012 14:33:07 +0000 (15:33 +0100)]
avfiltergraph: add AVOption table

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: avtools-common-opts: Fix terminology concerning metric prefixes
Marcus Stollsteimer [Mon, 19 Nov 2012 20:39:20 +0000 (21:39 +0100)]
doc: avtools-common-opts: Fix terminology concerning metric prefixes

'k', 'M', and 'G' are SI (unit) prefixes or metric prefixes,
not 'number postfixes'. Also, the statement regarding binary
prefixes ("powers of 2 are used instead of powers of 10")
might be misinterpreted (1 kB = 10^3 B, but 1 KiB != 2^3 B).

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoconfigure: suncc: Add compiler arch support for Nehalem & Sandy Bridge
Sean McGovern [Sun, 25 Nov 2012 06:32:57 +0000 (01:32 -0500)]
configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge

GCC does not appear to have a -march= string for Westmere, which is a
bit surprising as it has a few more instructions than a Nehalem, but
a few less than a Sandy Bridge.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoriff: Make ff_riff_tags static and move under appropriate #ifdef
Diego Biurrun [Wed, 21 Nov 2012 18:28:02 +0000 (19:28 +0100)]
riff: Make ff_riff_tags static and move under appropriate #ifdef

The table is not used outside the file.

7 years agosmacker: fix smacker_decode_header_tree() empty vlc table init
Michael Niedermayer [Sun, 25 Nov 2012 01:36:34 +0000 (02:36 +0100)]
smacker: fix smacker_decode_header_tree() empty vlc table init

Fixes Ticket1858

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomov: set flags to indicate that byte wise seeking is not supported.
Michael Niedermayer [Sun, 25 Nov 2012 00:15:47 +0000 (01:15 +0100)]
mov: set flags to indicate that byte wise seeking is not supported.

Fixes Ticket1831

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: add libswresample.texi and ffmpeg-resampler.texi files
Stefano Sabatini [Fri, 2 Nov 2012 11:24:04 +0000 (12:24 +0100)]
doc: add libswresample.texi and ffmpeg-resampler.texi files

7 years agodoc: move filters documentation to dedicated manual page ffmpeg-filters
Stefano Sabatini [Sun, 18 Nov 2012 12:04:37 +0000 (13:04 +0100)]
doc: move filters documentation to dedicated manual page ffmpeg-filters

7 years agodoc: move codec options and descriptions to a dedicated manual page
Stefano Sabatini [Sun, 18 Nov 2012 12:00:11 +0000 (13:00 +0100)]
doc: move codec options and descriptions to a dedicated manual page

7 years agolavf/sbgdec: use proper constants for av_log().
Nicolas George [Sat, 24 Nov 2012 22:56:52 +0000 (23:56 +0100)]
lavf/sbgdec: use proper constants for av_log().

7 years agoSupport u8 in aiff.
Carl Eugen Hoyos [Sat, 24 Nov 2012 20:21:50 +0000 (21:21 +0100)]
Support u8 in aiff.

Fixes ticket #1960.
Reviewed-by; Paul B Mahol

7 years agoadpcmdec: Fix OOM/infloop
Michael Niedermayer [Sat, 24 Nov 2012 18:17:23 +0000 (19:17 +0100)]
adpcmdec: Fix OOM/infloop

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibopencore_amrwb: check packet size
Michael Niedermayer [Sat, 24 Nov 2012 17:26:54 +0000 (18:26 +0100)]
libopencore_amrwb: check packet size

Fix OOM

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosmacker: sanity check audio size.
Michael Niedermayer [Sat, 24 Nov 2012 17:02:08 +0000 (18:02 +0100)]
smacker: sanity check audio size.

Fixes, excessive memory allocation
Fixes Ticket1892

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaf_aresample: check ff_get_audio_buffer() failure
Michael Niedermayer [Sat, 24 Nov 2012 16:33:32 +0000 (17:33 +0100)]
af_aresample: check ff_get_audio_buffer() failure

Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoatrac1: Check block align.
Michael Niedermayer [Sat, 24 Nov 2012 15:17:29 +0000 (16:17 +0100)]
atrac1: Check block align.

Fixes OOM
Fixes second samples posted in Ticket1893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agora288: Check block align.
Michael Niedermayer [Sat, 24 Nov 2012 15:17:29 +0000 (16:17 +0100)]
ra288: Check block align.

Fixes OOM
Fixes Ticket1893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix type of default value for v210 decoder option -custom_stride.
Carl Eugen Hoyos [Sat, 24 Nov 2012 15:09:07 +0000 (16:09 +0100)]
Fix type of default value for v210 decoder option -custom_stride.

Reviewed-by: Paul B Mahol
7 years agoc93: signal EOF
Piotr Bandurski [Sat, 24 Nov 2012 15:04:32 +0000 (15:04 +0000)]
c93: signal EOF

7 years agommf: simplify code by using FFMIN
Paul B Mahol [Sat, 24 Nov 2012 14:27:01 +0000 (14:27 +0000)]
mmf: simplify code by using FFMIN

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agommf: signal EOF
Paul B Mahol [Sat, 24 Nov 2012 14:24:13 +0000 (14:24 +0000)]
mmf: signal EOF

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoomadec: remove stale comment
Paul B Mahol [Sat, 24 Nov 2012 11:41:43 +0000 (11:41 +0000)]
omadec: remove stale comment

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agocodec_desc: mark PCM A-law/mu-law lossy
Paul B Mahol [Sat, 24 Nov 2012 11:19:27 +0000 (11:19 +0000)]
codec_desc: mark PCM A-law/mu-law lossy

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agocodec_desc: provide aliases for PCM A-law/mu-law
Paul B Mahol [Sat, 24 Nov 2012 11:14:06 +0000 (11:14 +0000)]
codec_desc: provide aliases for PCM A-law/mu-law

Inspired by d21b82fd3a72751a77dbeda3aa17a3af5e009565.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoADPCM IMA Dialogic decoder
Paul B Mahol [Wed, 21 Nov 2012 15:29:15 +0000 (15:29 +0000)]
ADPCM IMA Dialogic decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agorl2: return meaningful error codes
Paul B Mahol [Sat, 24 Nov 2012 10:27:22 +0000 (10:27 +0000)]
rl2: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agowvenc: multichannel muxing
Paul B Mahol [Sat, 24 Nov 2012 10:20:46 +0000 (10:20 +0000)]
wvenc: multichannel muxing

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoomaenc: remove superfluous "OMA: "
Paul B Mahol [Sat, 24 Nov 2012 09:55:05 +0000 (09:55 +0000)]
omaenc: remove superfluous "OMA: "

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoomaenc: abort for unsupported codecs
Paul B Mahol [Sat, 24 Nov 2012 09:51:47 +0000 (09:51 +0000)]
omaenc: abort for unsupported codecs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoriff: fix decoding of 24-bit packed int (type 1, 20-bit)
Piotr Bandurski [Sat, 24 Nov 2012 09:54:38 +0000 (10:54 +0100)]
riff: fix decoding of 24-bit packed int (type 1, 20-bit)

7 years agoSupport G.722 in Sun AU.
Carl Eugen Hoyos [Sat, 24 Nov 2012 09:43:32 +0000 (10:43 +0100)]
Support G.722 in Sun AU.

7 years agoAdd an annotation field as required by the specification when muxing Sun AU.
Carl Eugen Hoyos [Sat, 24 Nov 2012 09:38:15 +0000 (10:38 +0100)]
Add an annotation field as required by the specification when muxing Sun AU.

Reviewed-by: Paul B Mahol
7 years agoratecontrol: Fix assertion failure on mismatching 2pass file.
Michael Niedermayer [Sat, 24 Nov 2012 02:03:17 +0000 (03:03 +0100)]
ratecontrol: Fix assertion failure on mismatching 2pass file.

Fixes Ticket582

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: fix mixed declarations and statements.
Michael Niedermayer [Sat, 24 Nov 2012 02:02:11 +0000 (03:02 +0100)]
ffmpeg: fix mixed declarations and statements.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: Correct starttime based on non discarded streams.
Michael Niedermayer [Sat, 24 Nov 2012 00:34:52 +0000 (01:34 +0100)]
ffmpeg: Correct starttime based on non discarded streams.

Fixes Ticket1830

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: minor simplification of wraping code
Michael Niedermayer [Sat, 24 Nov 2012 00:34:26 +0000 (01:34 +0100)]
ffmpeg: minor simplification of wraping code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoriff: ignore ff_read_riff_info() failure.
Michael Niedermayer [Fri, 23 Nov 2012 22:35:16 +0000 (23:35 +0100)]
riff: ignore ff_read_riff_info() failure.

Some files simply contain invalid info tags.
Fixes unrelated bug posted into Ticket1821

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffprobe: free dictionary in opt_show_entries()
Stefano Sabatini [Fri, 23 Nov 2012 17:48:10 +0000 (18:48 +0100)]
ffprobe: free dictionary in opt_show_entries()

Fix memleak.

7 years agofate: add ADPCM AFC decoder test
Paul B Mahol [Fri, 23 Nov 2012 12:03:14 +0000 (12:03 +0000)]
fate: add ADPCM AFC decoder test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofate: add AST demuxer test
Paul B Mahol [Fri, 23 Nov 2012 11:58:15 +0000 (11:58 +0000)]
fate: add AST demuxer test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoreplace av_log(0, by av_log(NULL,
Michael Niedermayer [Fri, 23 Nov 2012 17:10:02 +0000 (18:10 +0100)]
replace av_log(0, by av_log(NULL,

The first parameter is a pointer and NULL is more correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_mandelbrot: give all av_log a context
Michael Niedermayer [Fri, 23 Nov 2012 17:05:16 +0000 (18:05 +0100)]
vf_mandelbrot: give all av_log a context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86/mpegvideoenc_template: use av_assert
Michael Niedermayer [Fri, 23 Nov 2012 16:57:22 +0000 (17:57 +0100)]
x86/mpegvideoenc_template: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomotion_est: use av_assert* instead of assert
Michael Niedermayer [Fri, 23 Nov 2012 15:40:53 +0000 (16:40 +0100)]
motion_est: use av_assert* instead of assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh263dec: switch 2 asserts to av_assert
Michael Niedermayer [Fri, 23 Nov 2012 15:36:17 +0000 (16:36 +0100)]
h263dec: switch 2 asserts to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodv: use av_assert
Michael Niedermayer [Fri, 23 Nov 2012 14:52:12 +0000 (15:52 +0100)]
dv: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 23 Nov 2012 13:03:31 +0000 (14:03 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: sort cpuflags section by architecture

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '457cc333b424994ecf80a82369325771e0397fd9'
Michael Niedermayer [Fri, 23 Nov 2012 12:53:47 +0000 (13:53 +0100)]
Merge commit '457cc333b424994ecf80a82369325771e0397fd9'

* commit '457cc333b424994ecf80a82369325771e0397fd9':
  configure: properly support DEC/Compaq compiler

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '4a606c830ae664013cea33800094d4d0f4ec62da'
Michael Niedermayer [Fri, 23 Nov 2012 12:30:51 +0000 (13:30 +0100)]
Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'

* commit '4a606c830ae664013cea33800094d4d0f4ec62da':
  av_memcpy_backptr: optimise some special cases
  mpegvideo: simplify dxy calculation in hpel_motion()
  build: add rules to generate preprocessed source files

Conflicts:
Makefile
libavutil/mem.c
library.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: sort cpuflags section by architecture
Mans Rullgard [Sun, 18 Nov 2012 15:22:04 +0000 (15:22 +0000)]
configure: sort cpuflags section by architecture

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoconfigure: properly support DEC/Compaq compiler
Mans Rullgard [Mon, 22 Oct 2012 23:05:44 +0000 (00:05 +0100)]
configure: properly support DEC/Compaq compiler

Signed-off-by: Mans Rullgard <mans@mansr.com>