ffmpeg.git
6 years agodoc: add ffmpeg-protocols.texi manual
Stefano Sabatini [Mon, 26 Nov 2012 22:52:50 +0000 (23:52 +0100)]
doc: add ffmpeg-protocols.texi manual

6 years agodoc: move syntax and eval chapters from libavutil to ffmpeg-utils
Stefano Sabatini [Mon, 26 Nov 2012 22:47:56 +0000 (23:47 +0100)]
doc: move syntax and eval chapters from libavutil to ffmpeg-utils

Move utilities description to a dedicated manual, consistent with what I
did with the rest of the documentation.

6 years agodoc: add libavdevice.texi and ffmpeg-devices.texi files
Stefano Sabatini [Mon, 26 Nov 2012 22:38:32 +0000 (23:38 +0100)]
doc: add libavdevice.texi and ffmpeg-devices.texi files

6 years agodoc: add libavformat.texi and ffmpeg-formats.texi files
Stefano Sabatini [Sun, 18 Nov 2012 12:39:18 +0000 (13:39 +0100)]
doc: add libavformat.texi and ffmpeg-formats.texi files

6 years agolavfi/drawtext: add support to expansion of generic expressions
Stefano Sabatini [Tue, 27 Nov 2012 10:27:12 +0000 (11:27 +0100)]
lavfi/drawtext: add support to expansion of generic expressions

6 years agomjpegdec: dont set got_picture to 0 per frame.
Michael Niedermayer [Tue, 27 Nov 2012 19:15:32 +0000 (20:15 +0100)]
mjpegdec: dont set got_picture to 0 per frame.

Fixes Ticket1915

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpegdec: reset got_picture on errors, successful return, init and flush.
Michael Niedermayer [Tue, 27 Nov 2012 19:14:35 +0000 (20:14 +0100)]
mjpegdec: reset got_picture on errors, successful return, init and flush.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpegdec: replace returns by goto fail in frame decode.
Michael Niedermayer [Tue, 27 Nov 2012 19:13:18 +0000 (20:13 +0100)]
mjpegdec: replace returns by goto fail in frame decode.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpegdec: make sure ret is set before its used.
Michael Niedermayer [Tue, 27 Nov 2012 19:12:07 +0000 (20:12 +0100)]
mjpegdec: make sure ret is set before its used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add ADPCM IMA Dialogic OKI decoder test
Paul B Mahol [Mon, 26 Nov 2012 10:36:50 +0000 (10:36 +0000)]
fate: add ADPCM IMA Dialogic OKI decoder test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoh264: support invalid annex B in mp4
Michael Niedermayer [Tue, 27 Nov 2012 17:06:00 +0000 (18:06 +0100)]
h264: support invalid annex B in mp4

Fixes Ticket1914

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffserver remove CONFIG_NOCUTILS check
Michael Niedermayer [Tue, 27 Nov 2012 13:41:41 +0000 (14:41 +0100)]
ffserver remove CONFIG_NOCUTILS check

Nothing sets CONFIG_NOCUTILS, i also dont remember anything setting it in
the past.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 27 Nov 2012 13:36:12 +0000 (14:36 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: set Picture.owner2 to the current thread

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8'
Michael Niedermayer [Tue, 27 Nov 2012 13:21:13 +0000 (14:21 +0100)]
Merge commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8'

* commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8':
  h264: check ref_count validity for num_ref_idx_active_override_flag
  h264: add missing new line to log message
  dcadec: skip QMF on unused channels
  wavenc: write fact chunk sample count at the correct file position
  riff: do not add empty metadata tags in INFO chunk

Conflicts:
libavcodec/dcadec.c
libavcodec/h264.c
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9'
Michael Niedermayer [Tue, 27 Nov 2012 13:03:57 +0000 (14:03 +0100)]
Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9'

* commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9':
  riff: only warn on a bad INFO chunk code size instead of failing
  configure: Add separate list for libraries and use where appropriate
  x86: float_dsp: add SSE version of vector_fmul_scalar()

Conflicts:
configure
libavformat/riff.c
libavutil/x86/float_dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b'
Michael Niedermayer [Tue, 27 Nov 2012 12:39:52 +0000 (13:39 +0100)]
Merge commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b'

* commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b':
  dsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutil
  aacenc: use the correct output buffer
  aacdec: fix signed overflows in lcg_random()
  base64: fix signed overflow in shift

Conflicts:
libavcodec/dsputil.c
libavutil/base64.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofile: fix 10l error in access() check
Michael Niedermayer [Tue, 27 Nov 2012 12:12:49 +0000 (13:12 +0100)]
file: fix 10l error in access() check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: set Picture.owner2 to the current thread
Janne Grunau [Sun, 25 Nov 2012 18:42:16 +0000 (19:42 +0100)]
h264: set Picture.owner2 to the current thread

This does not seem to have an effect currently. Fate-h264 passes with
THREADS=1..16 and both threading types as before. It fixes however a
segfault during error resilience with my adaptive-frame-mt patchset.
A picture in use during error resilience gets realloced in another
thread in the fuzzed sample sample_varPAR.avi_s226019.

6 years agoh264: check ref_count validity for num_ref_idx_active_override_flag
Janne Grunau [Sun, 25 Nov 2012 15:02:02 +0000 (16:02 +0100)]
h264: check ref_count validity for num_ref_idx_active_override_flag

Fixes segfault in the fuzzed sample bipbop234.ts_s226407.

CC: libav-stable@libav.org
6 years agoh264: add missing new line to log message
Janne Grunau [Wed, 21 Nov 2012 19:13:15 +0000 (20:13 +0100)]
h264: add missing new line to log message

6 years agoAFC demuxer
Paul B Mahol [Mon, 26 Nov 2012 12:49:46 +0000 (12:49 +0000)]
AFC demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoastdec: improve probing
Paul B Mahol [Tue, 27 Nov 2012 10:12:28 +0000 (10:12 +0000)]
astdec: improve probing

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/overlay: enable yuva420p as overlay background
Mark Himsley [Sun, 25 Nov 2012 15:24:29 +0000 (15:24 +0000)]
lavfi/overlay: enable yuva420p as overlay background

Same calculation as for RGBA etc to create unpremultiplied output.
Useful for creating an intermediate "Mix/Effects bank", in vision mixer
(switcher) terminology.

Example command:

ffmpeg -i input.mov -vf
"[in]scale=iw:ih:interl=1,format=yuv420p[bg];movie=BBC_blocks_watermark.png,scale=iw:ih:interl=1,format=yuva420p[dog];movie=Kickabout_strap.mov,scale=iw:ih:interl=1,format=yuva420p[strap];[strap][dog]overlay=0:0[me1];[bg][me1]overlay=0:0,scale=0:0:interl=1[out]"
-b:v 3M -an output.mov

Fix trac ticket #549.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agocafdec: fix seeking with adpcm
Michael Niedermayer [Tue, 27 Nov 2012 03:33:25 +0000 (04:33 +0100)]
cafdec: fix seeking with adpcm

Fixes Ticket1906

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofile: Fallback to stat() based file_check() when access() or its named flags are...
Michael Niedermayer [Tue, 27 Nov 2012 03:57:18 +0000 (04:57 +0100)]
file: Fallback to stat() based file_check() when access() or its named flags are unavailable.

Should fix compilation on native windows
We could also use _access() and literal numbers as flags but i cant test it
and the compilation failure should be fixed ASAP

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: check for access()
Michael Niedermayer [Tue, 27 Nov 2012 03:55:26 +0000 (04:55 +0100)]
configure: check for access()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodcadec: skip QMF on unused channels
Michael Niedermayer [Mon, 29 Oct 2012 04:21:47 +0000 (05:21 +0100)]
dcadec: skip QMF on unused channels

When the extra rear channel is present but unused, the
s->channel_order_tab[] value for that channel is -1. The QMF can be
skipped for the extra channel, and doing so avoids an out-of-array read
on s->samples_chanptr[].

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agofile: fix file_check()
Michael Niedermayer [Tue, 27 Nov 2012 01:57:20 +0000 (02:57 +0100)]
file: fix file_check()

Fixes Ticket1904

This should work on windows, but if not please contact me ASAP
i have another idea on how to solve this without access() if that
really doesnt work on windows.

Strongly based on patch by divVerent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowavenc: write fact chunk sample count at the correct file position
Michael Niedermayer [Tue, 30 Oct 2012 20:48:39 +0000 (21:48 +0100)]
wavenc: write fact chunk sample count at the correct file position

Fixes curruption of metadata in the INFO chunk.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agoriff: only warn on a bad INFO chunk code size instead of failing
Justin Ruggles [Sun, 25 Nov 2012 17:38:58 +0000 (12:38 -0500)]
riff: only warn on a bad INFO chunk code size instead of failing

fixes Bug 392

6 years agoriff: do not add empty metadata tags in INFO chunk
Justin Ruggles [Sun, 25 Nov 2012 17:40:54 +0000 (12:40 -0500)]
riff: do not add empty metadata tags in INFO chunk

6 years agoconfigure: Add separate list for libraries and use where appropriate
Diego Biurrun [Sun, 11 Nov 2012 12:37:40 +0000 (13:37 +0100)]
configure: Add separate list for libraries and use where appropriate

6 years agoget_dc: fix rounding
Michael Niedermayer [Mon, 26 Nov 2012 20:26:24 +0000 (21:26 +0100)]
get_dc: fix rounding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaf_aresample: consistently use ROUNDED_DIV
Michael Niedermayer [Mon, 26 Nov 2012 19:17:16 +0000 (20:17 +0100)]
af_aresample: consistently use ROUNDED_DIV

This fixes issues with negative timestamps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg4videodec: use ROUNDED_DIV for pts calculation
Michael Niedermayer [Mon, 26 Nov 2012 19:16:25 +0000 (20:16 +0100)]
mpeg4videodec: use ROUNDED_DIV for pts calculation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoadpcm: thp, afc: support multichannel decoding
Paul B Mahol [Mon, 26 Nov 2012 19:52:40 +0000 (19:52 +0000)]
adpcm: thp, afc: support multichannel decoding

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoh264: Fix minor bug in h264.c error trace
Sergio Garcia Murillo [Mon, 26 Nov 2012 16:19:56 +0000 (17:19 +0100)]
h264: Fix minor bug in h264.c error trace

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: float_dsp: add SSE version of vector_fmul_scalar()
Justin Ruggles [Sat, 22 Sep 2012 22:41:25 +0000 (18:41 -0400)]
x86: float_dsp: add SSE version of vector_fmul_scalar()

6 years agodsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutil
Justin Ruggles [Sat, 22 Sep 2012 22:13:57 +0000 (18:13 -0400)]
dsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutil

6 years agoaacenc: use the correct output buffer
Michael Niedermayer [Mon, 26 Nov 2012 15:30:51 +0000 (10:30 -0500)]
aacenc: use the correct output buffer

This fixes segfault caused by 3d3cf6745e2a5dc9c377244454c3186d75b177fa
when SingleChannelElement.ret was renamed to SingleChannelElement.ret_buf.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agoaf_aresample: fix rounding of negative timestamps
Michael Niedermayer [Mon, 26 Nov 2012 15:25:47 +0000 (16:25 +0100)]
af_aresample: fix rounding of negative timestamps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 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>
6 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>
6 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>
6 years agoaacdec: fix signed overflows in lcg_random()
Mans Rullgard [Sat, 24 Nov 2012 13:12:47 +0000 (13:12 +0000)]
aacdec: fix signed overflows in lcg_random()

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agobase64: fix signed overflow in shift
Mans Rullgard [Sat, 24 Nov 2012 13:03:53 +0000 (13:03 +0000)]
base64: fix signed overflow in shift

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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
6 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
6 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
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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

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

6 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

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

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

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

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

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

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

6 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

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

6 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

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

6 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

6 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

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

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

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

6 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