ffmpeg.git
7 years agoMerge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'
Michael Niedermayer [Fri, 14 Dec 2012 12:58:12 +0000 (13:58 +0100)]
Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'

* commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e':
  doc: improve documentation for the asyncts filter first_pts option
  asyncts: fix the asyncts behavior when using the first_pts option

Conflicts:
libavfilter/af_asyncts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '8083332c2de9ee189f96844ff4c2d9be1844116f'
Michael Niedermayer [Fri, 14 Dec 2012 12:51:16 +0000 (13:51 +0100)]
Merge commit '8083332c2de9ee189f96844ff4c2d9be1844116f'

* commit '8083332c2de9ee189f96844ff4c2d9be1844116f':
  asyncts: use clipped delta value when setting resample compensation
  asyncts: fix flushing of final samples at EOF
  vp6: properly fail on unsupported feature

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosauce: test filetype correctly for datatype 5 (binary text)
Peter Ross [Thu, 13 Dec 2012 23:06:15 +0000 (10:06 +1100)]
sauce: test filetype correctly for datatype 5 (binary text)

7 years agomem: minor simplification of the alignment hack code
Michael Niedermayer [Fri, 14 Dec 2012 04:36:22 +0000 (05:36 +0100)]
mem: minor simplification of the alignment hack code

Idea-by: wanzhang
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaudioconvert/arm: require alignment of 16
Michael Niedermayer [Fri, 14 Dec 2012 03:49:09 +0000 (04:49 +0100)]
audioconvert/arm: require alignment of 16

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaudioconvert: support simd code with specific alignment requirements.
Michael Niedermayer [Fri, 14 Dec 2012 03:47:17 +0000 (04:47 +0100)]
audioconvert: support simd code with specific alignment requirements.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure/arm: print if thumb mode is enabled
Michael Niedermayer [Fri, 14 Dec 2012 01:37:32 +0000 (02:37 +0100)]
configure/arm: print if thumb mode is enabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agog729dec: check pitch_delay_int.
Michael Niedermayer [Fri, 14 Dec 2012 00:12:56 +0000 (01:12 +0100)]
g729dec: check pitch_delay_int.

Fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agonuv: dont try to copy an empty frame
Michael Niedermayer [Thu, 13 Dec 2012 23:30:34 +0000 (00:30 +0100)]
nuv: dont try to copy an empty frame

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflvenc: don't write random data if seek fails
Björn Axelsson [Thu, 13 Dec 2012 13:48:25 +0000 (14:48 +0100)]
flvenc: don't write random data if seek fails

The FLV muxer tries to update the header in write_trailer, which is
impossible if writing to a pipe or network stream. Don't write header
data if seek to header fails.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodocs: -asyncts has been replaced by aresample not asyncts in ffmpeg
Michael Niedermayer [Thu, 13 Dec 2012 17:31:10 +0000 (18:31 +0100)]
docs: -asyncts has been replaced by aresample not asyncts in ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/segment: add segment_start_number option
Stefano Sabatini [Sun, 9 Dec 2012 17:21:00 +0000 (18:21 +0100)]
lavf/segment: add segment_start_number option

Consistent with the image2 muxer.

7 years agolavf/segment: add function set_segment_filename()
Stefano Sabatini [Thu, 13 Dec 2012 10:37:50 +0000 (11:37 +0100)]
lavf/segment: add function set_segment_filename()

Factorize.

7 years agodoc: improve documentation for the asyncts filter first_pts option
Justin Ruggles [Wed, 12 Dec 2012 18:19:16 +0000 (13:19 -0500)]
doc: improve documentation for the asyncts filter first_pts option

Note the time base for the option. Add an additional example description.

7 years agoasyncts: use clipped delta value when setting resample compensation
Justin Ruggles [Wed, 12 Dec 2012 18:26:57 +0000 (13:26 -0500)]
asyncts: use clipped delta value when setting resample compensation

The max_comp option is supposed to limit maximum compensation, but
currently the clipped value is not actually used.

7 years agoasyncts: fix the asyncts behavior when using the first_pts option
Justin Ruggles [Tue, 11 Dec 2012 22:36:09 +0000 (17:36 -0500)]
asyncts: fix the asyncts behavior when using the first_pts option

Currently it will do padding, but it does not properly handle
start-of-stream trimming as documented.

7 years agoasyncts: fix flushing of final samples at EOF
Justin Ruggles [Wed, 12 Dec 2012 18:10:13 +0000 (13:10 -0500)]
asyncts: fix flushing of final samples at EOF

7 years agoaresample: increase n_out buffer size a bit to reduce delay in some corner cases
Michael Niedermayer [Thu, 13 Dec 2012 17:17:48 +0000 (18:17 +0100)]
aresample: increase n_out buffer size a bit to reduce delay in some corner cases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts: check av_new_stream() return value.
Michael Niedermayer [Thu, 13 Dec 2012 16:46:17 +0000 (17:46 +0100)]
mpegts: check av_new_stream() return value.

Fixes CID703728
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovp6: properly fail on unsupported feature
Luca Barbato [Thu, 13 Dec 2012 15:20:19 +0000 (16:20 +0100)]
vp6: properly fail on unsupported feature

Interlacing is not supported at all and mismanaged down the normal
codepaths causing possible buffer management issues.

CC: libav-stable@libav.org
7 years agoqt-faststart: Check offset_count
Michael Niedermayer [Thu, 13 Dec 2012 14:07:20 +0000 (15:07 +0100)]
qt-faststart: Check offset_count

Fixes CID733836
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocavsdec: check ff_get_buffer() return value
Michael Niedermayer [Thu, 13 Dec 2012 13:32:58 +0000 (14:32 +0100)]
cavsdec: check ff_get_buffer() return value

Fixes CID747721
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosnowenc: check ff_get_buffer() return value
Michael Niedermayer [Thu, 13 Dec 2012 13:26:03 +0000 (14:26 +0100)]
snowenc: check ff_get_buffer() return value

Fixes CID747722
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosvq1enc: check ff_get_buffer() return value
Michael Niedermayer [Thu, 13 Dec 2012 13:20:24 +0000 (14:20 +0100)]
svq1enc: check ff_get_buffer() return value

Fixes CID747723
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoalsdec: propagate error codes in read_block()
Michael Niedermayer [Thu, 13 Dec 2012 02:07:33 +0000 (03:07 +0100)]
alsdec: propagate error codes in read_block()

Reviewed-by: Thilo Borgmann <thilo.borgmann@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoalsdec: make return checking for read_*_block_data() consistent
Michael Niedermayer [Thu, 13 Dec 2012 02:04:49 +0000 (03:04 +0100)]
alsdec: make return checking for read_*_block_data() consistent

Reviewed-by: Thilo Borgmann <thilo.borgmann@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoalsdec: Use AVERROR_INVALIDDATA in read_const_block_data
Michael Niedermayer [Thu, 13 Dec 2012 02:03:56 +0000 (03:03 +0100)]
alsdec: Use AVERROR_INVALIDDATA in read_const_block_data

Reviewed-by: Thilo Borgmann <thilo.borgmann@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomips: ac3 downmix updated to the new data layout.
Nedeljko Babic [Thu, 13 Dec 2012 08:54:04 +0000 (09:54 +0100)]
mips: ac3 downmix updated to the new data layout.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/matroskaenc: check for overflow in display width.
Nicolas George [Wed, 12 Dec 2012 20:19:24 +0000 (21:19 +0100)]
lavf/matroskaenc: check for overflow in display width.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 13 Dec 2012 11:23:48 +0000 (12:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.
  x86inc: fix stack alignment on win64
  rtpproto: Remove unused defines

Conflicts:
libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667'
Michael Niedermayer [Thu, 13 Dec 2012 11:18:00 +0000 (12:18 +0100)]
Merge commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667'

* commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667':
  rtpdec_mpeg4: Cosmetic cleanup
  rtpdec: Cosmetic cleanup of the header
  rtpdec: Get rid of a useless _s suffix on a struct name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7941159df6aad2d219e2a7184489be7a735dd944'
Michael Niedermayer [Thu, 13 Dec 2012 11:06:19 +0000 (12:06 +0100)]
Merge commit '7941159df6aad2d219e2a7184489be7a735dd944'

* commit '7941159df6aad2d219e2a7184489be7a735dd944':
  rtpdec/enc: Remove outdated/useless/misleading comments
  rtpdec: Improve some comments
  rtpdec: Remove unused context variables
  rtpdec: Limit writing to the buffer size
  svq1: Fix building with -DDEBUG
  svq1: return meaningful error codes.

Conflicts:
libavcodec/svq1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '998fdcff41bbda8ef13c991743376556f910efa9'
Michael Niedermayer [Thu, 13 Dec 2012 10:53:09 +0000 (11:53 +0100)]
Merge commit '998fdcff41bbda8ef13c991743376556f910efa9'

* commit '998fdcff41bbda8ef13c991743376556f910efa9':
  lavc: replace some forgotten instances of PixelFormat with AVPixelFormat
  svq1: unmacroify macros used only once.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '95baf701db719ecad6b31000429e20eca2526ed6'
Michael Niedermayer [Thu, 13 Dec 2012 10:38:52 +0000 (11:38 +0100)]
Merge commit '95baf701db719ecad6b31000429e20eca2526ed6'

* commit '95baf701db719ecad6b31000429e20eca2526ed6':
  svq1: deMpegEncContextize

Conflicts:
libavcodec/svq1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: drop ff_null_start_frame/end_frame/draw_slice.
Michael Niedermayer [Thu, 13 Dec 2012 02:35:53 +0000 (03:35 +0100)]
lavfi: drop ff_null_start_frame/end_frame/draw_slice.

The functions have become unused

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/select: assign NAN to ignored values
Stefano Sabatini [Tue, 11 Dec 2012 23:28:09 +0000 (00:28 +0100)]
lavfi/select: assign NAN to ignored values

Also log scene value. Improve debugging.

7 years agolavfi/select: add support to options
Stefano Sabatini [Tue, 11 Dec 2012 23:21:26 +0000 (00:21 +0100)]
lavfi/select: add support to options

Add options introspection, and improve error feedback.

7 years agolavfi/select: in select_frame(), rename picref -> ref
Stefano Sabatini [Tue, 11 Dec 2012 22:45:29 +0000 (23:45 +0100)]
lavfi/select: in select_frame(), rename picref -> ref

The variable is now used also for audio frames.

7 years agodoc/filters: itemize select/aselect examples
Stefano Sabatini [Tue, 11 Dec 2012 22:31:54 +0000 (23:31 +0100)]
doc/filters: itemize select/aselect examples

Improve rendering.

7 years agolavfi: mv vf_select.c -> f_select.c
Stefano Sabatini [Tue, 11 Dec 2012 22:26:01 +0000 (23:26 +0100)]
lavfi: mv vf_select.c -> f_select.c

The file now contains also an audio select implementation. Also move the
aselect/select documentation from video filters to the multimedia filters
section.

7 years agolavfi: add aselect audio variant of select
Stefano Sabatini [Tue, 11 Dec 2012 00:19:30 +0000 (01:19 +0100)]
lavfi: add aselect audio variant of select

7 years agolavfi/select: remove deprecated and unused poll_frame() callback
Stefano Sabatini [Mon, 10 Dec 2012 23:49:37 +0000 (00:49 +0100)]
lavfi/select: remove deprecated and unused poll_frame() callback

Simplify.

7 years agoaacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.
Alex Converse [Wed, 12 Dec 2012 01:26:10 +0000 (17:26 -0800)]
aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.

Found-by: pawlkt
CC: libav-stable@libav.org
7 years agolavf/matroskaenc: use integers to for display size.
Nicolas George [Sat, 8 Dec 2012 10:50:54 +0000 (11:50 +0100)]
lavf/matroskaenc: use integers to for display size.

Avoid rounding differences between x86_32 and x86_64.
Fix trac ticket #1997.

7 years agox86inc: fix stack alignment on win64
Ronald S. Bultje [Wed, 12 Dec 2012 19:00:22 +0000 (20:00 +0100)]
x86inc: fix stack alignment on win64

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agompeg1video: fix regression with slices != threads
Michael Niedermayer [Wed, 12 Dec 2012 18:52:46 +0000 (19:52 +0100)]
mpeg1video: fix regression with slices != threads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg1video: support multi threaded slice encoding.
Michael Niedermayer [Wed, 12 Dec 2012 18:29:32 +0000 (19:29 +0100)]
mpeg1video: support multi threaded slice encoding.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadpcm: fix off by 1 error and out of array access in DK4
Michael Niedermayer [Wed, 12 Dec 2012 16:14:32 +0000 (17:14 +0100)]
adpcm: fix off by 1 error and out of array access in DK4

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomsmpeg4dec: fix coeff index
Michael Niedermayer [Wed, 12 Dec 2012 15:56:10 +0000 (16:56 +0100)]
msmpeg4dec: fix coeff index

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoread_gab2_sub: fix null pointer dereference
Michael Niedermayer [Wed, 12 Dec 2012 13:27:46 +0000 (14:27 +0100)]
read_gab2_sub: fix null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter_get_audio_buffer_ref_from_frame: check that layout and channels match if...
Michael Niedermayer [Wed, 12 Dec 2012 16:42:58 +0000 (17:42 +0100)]
avfilter_get_audio_buffer_ref_from_frame: check that layout and channels match if they are set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: sub2video: use start and end time.
Nicolas George [Thu, 29 Nov 2012 19:25:37 +0000 (20:25 +0100)]
ffmpeg: sub2video: use start and end time.

Until now, the end_display_time was ignored, making single
packets subtitles (like dvdsub) stay indefinitely.

start_display_time was also ignored, but is it almost always 0.

7 years agortpproto: Remove unused defines
Martin Storsjö [Tue, 11 Dec 2012 22:01:29 +0000 (00:01 +0200)]
rtpproto: Remove unused defines

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoff_copy_buffer_ref: use the channel count
Michael Niedermayer [Wed, 12 Dec 2012 13:10:48 +0000 (14:10 +0100)]
ff_copy_buffer_ref: use the channel count

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter_get_video_buffer_ref_from_frame: check channel count
Michael Niedermayer [Wed, 12 Dec 2012 13:09:19 +0000 (14:09 +0100)]
avfilter_get_video_buffer_ref_from_frame: check channel count

more than 8 channels is not supported and crashes with null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoalsdec: check block length
Michael Niedermayer [Wed, 12 Dec 2012 11:28:45 +0000 (12:28 +0100)]
alsdec: check block length

Fix writing over the end

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/concatdec: avoid leaking URLs.
Nicolas George [Wed, 12 Dec 2012 11:15:57 +0000 (12:15 +0100)]
lavf/concatdec: avoid leaking URLs.

Use av_realloc instead of av_realloc_f to keep the original
array in case of failure: it is freed in full by the fail label.

7 years agomxf_set_audio_pts: fix division by 0
Michael Niedermayer [Wed, 12 Dec 2012 10:35:31 +0000 (11:35 +0100)]
mxf_set_audio_pts: fix division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggspeexparse: fix array overread
Michael Niedermayer [Wed, 12 Dec 2012 10:20:55 +0000 (11:20 +0100)]
oggspeexparse: fix array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortpdec_mpeg4: Cosmetic cleanup
Martin Storsjö [Tue, 11 Dec 2012 19:42:32 +0000 (21:42 +0200)]
rtpdec_mpeg4: Cosmetic cleanup

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpdec: Cosmetic cleanup of the header
Martin Storsjö [Tue, 11 Dec 2012 18:23:50 +0000 (20:23 +0200)]
rtpdec: Cosmetic cleanup of the header

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpdec: Get rid of a useless _s suffix on a struct name
Martin Storsjö [Tue, 11 Dec 2012 16:24:46 +0000 (18:24 +0200)]
rtpdec: Get rid of a useless _s suffix on a struct name

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpdec/enc: Remove outdated/useless/misleading comments
Martin Storsjö [Tue, 11 Dec 2012 16:50:10 +0000 (18:50 +0200)]
rtpdec/enc: Remove outdated/useless/misleading comments

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpdec: Improve some comments
Martin Storsjö [Tue, 11 Dec 2012 17:57:18 +0000 (19:57 +0200)]
rtpdec: Improve some comments

The previous comment about the buffer was wildly inaccurate and
misleading.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpdec: Remove unused context variables
Martin Storsjö [Tue, 11 Dec 2012 17:35:03 +0000 (19:35 +0200)]
rtpdec: Remove unused context variables

These stem from back when both the rtp muxer and rtp depacketizing
shared the same struct.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpdec: Limit writing to the buffer size
Martin Storsjö [Tue, 11 Dec 2012 16:58:59 +0000 (18:58 +0200)]
rtpdec: Limit writing to the buffer size

This fixes potential buffer overwrites.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosvq1: Fix building with -DDEBUG
Martin Storsjö [Wed, 12 Dec 2012 09:27:03 +0000 (11:27 +0200)]
svq1: Fix building with -DDEBUG

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 12 Dec 2012 09:50:14 +0000 (10:50 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavr: fix segfault due to overlooked change needed in 14758e3
  x86inc: support stack mem allocation and re-alignment in PROLOGUE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86inc: support stack mem allocation and re-alignment in PROLOGUE.
Ronald S. Bultje [Sun, 9 Dec 2012 00:12:38 +0000 (16:12 -0800)]
x86inc: support stack mem allocation and re-alignment in PROLOGUE.

Use this in VP8/H264-8bit loopfilter functions so they can be used if
there is no aligned stack (e.g. MSVC 32bit or ICC 10.x).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '14758e3211d34a97c42b07acae117ce5627d7f57'
Michael Niedermayer [Wed, 12 Dec 2012 09:31:49 +0000 (10:31 +0100)]
Merge commit '14758e3211d34a97c42b07acae117ce5627d7f57'

* commit '14758e3211d34a97c42b07acae117ce5627d7f57':
  lavr: temporarily store custom matrix in AVAudioResampleContext
  lavr: clarify documentation for avresample_get/set_matrix()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3'
Michael Niedermayer [Wed, 12 Dec 2012 09:16:19 +0000 (10:16 +0100)]
Merge commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3'

* commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3':
  swfdec: cosmetics: fix indentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswfdec: print warning when len is cliped
Michael Niedermayer [Wed, 12 Dec 2012 09:01:43 +0000 (10:01 +0100)]
swfdec: print warning when len is cliped

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix frame-rate documentation.
Carl Eugen Hoyos [Wed, 12 Dec 2012 09:08:43 +0000 (10:08 +0100)]
Fix frame-rate documentation.

7 years agosvq1: return meaningful error codes.
Anton Khirnov [Sat, 8 Dec 2012 09:11:13 +0000 (10:11 +0100)]
svq1: return meaningful error codes.

7 years agolavc: replace some forgotten instances of PixelFormat with AVPixelFormat
Anton Khirnov [Sat, 8 Dec 2012 09:04:56 +0000 (10:04 +0100)]
lavc: replace some forgotten instances of PixelFormat with AVPixelFormat

7 years agosvq1: unmacroify macros used only once.
Anton Khirnov [Fri, 7 Dec 2012 18:58:20 +0000 (19:58 +0100)]
svq1: unmacroify macros used only once.

7 years agosvq1: deMpegEncContextize
Anton Khirnov [Fri, 7 Dec 2012 16:10:01 +0000 (17:10 +0100)]
svq1: deMpegEncContextize

This decoder is quite simple and none of the MpegEncContext complexity
is actually needed.

7 years agoMerge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a'
Michael Niedermayer [Wed, 12 Dec 2012 08:55:56 +0000 (09:55 +0100)]
Merge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a'

* commit 'e70c5b034c4787377e82cab2d5565486baec0c2a':
  swfdec: do better validation of tag length
  Make LOCAL_ALIGNED syntactically similar on all systems

Conflicts:
libavformat/swfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavr: fix segfault due to overlooked change needed in 14758e3
Justin Ruggles [Tue, 11 Dec 2012 20:56:17 +0000 (15:56 -0500)]
lavr: fix segfault due to overlooked change needed in 14758e3

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agox86inc: support stack mem allocation and re-alignment in PROLOGUE
Ronald S. Bultje [Sun, 9 Dec 2012 00:12:38 +0000 (16:12 -0800)]
x86inc: support stack mem allocation and re-alignment in PROLOGUE

Use this in VP8/H264-8bit loopfilter functions so they can be used if
there is no aligned stack (e.g. MSVC 32bit or ICC 10.x).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agolavfi/showinfo: check plane count before dereferencing.
Clément Bœsch [Wed, 12 Dec 2012 01:55:10 +0000 (02:55 +0100)]
lavfi/showinfo: check plane count before dereferencing.

7 years agoac3dec: fix out of array read
Michael Niedermayer [Wed, 12 Dec 2012 00:21:24 +0000 (01:21 +0100)]
ac3dec: fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocafdec: Check duration before use.
Michael Niedermayer [Tue, 11 Dec 2012 23:11:15 +0000 (00:11 +0100)]
cafdec: Check duration before use.

Fix division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobfi: fix division by 0
Michael Niedermayer [Tue, 11 Dec 2012 23:00:25 +0000 (00:00 +0100)]
bfi: fix division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoChangelog: update for soxr
Michael Niedermayer [Tue, 11 Dec 2012 21:22:59 +0000 (22:22 +0100)]
Changelog: update for soxr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/ffmpeg: fix/extend documentation for -copyts
Stefano Sabatini [Wed, 21 Nov 2012 23:21:37 +0000 (00:21 +0100)]
doc/ffmpeg: fix/extend documentation for -copyts

7 years agoswr: Add SOX resampler support
Rob Sykes [Tue, 11 Dec 2012 20:43:42 +0000 (21:43 +0100)]
swr: Add SOX resampler support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: add a lowpass default so that each Resampler can have its own default.
Rob Sykes [Tue, 11 Dec 2012 20:23:24 +0000 (21:23 +0100)]
swr: add a lowpass default so that each Resampler can have its own default.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: move flush into Resampler
Michael Niedermayer [Tue, 11 Dec 2012 20:19:39 +0000 (21:19 +0100)]
swr: move flush into Resampler

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: make realloc_audio() available outside swresample.c
Michael Niedermayer [Tue, 11 Dec 2012 20:15:19 +0000 (21:15 +0100)]
swr: make realloc_audio() available outside swresample.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: Add API to make resample engine selectable.
Rob Sykes [Tue, 11 Dec 2012 17:36:58 +0000 (18:36 +0100)]
swr: Add API to make resample engine selectable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/utils: Do not require dimensions for PNG.
Michael Niedermayer [Tue, 11 Dec 2012 17:25:56 +0000 (18:25 +0100)]
lavc/utils: Do not require dimensions for PNG.

pngenc doesnt need them and mplayer doesnt set them.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: fix grammar mistake in setfield documentation
Stefano Sabatini [Tue, 11 Dec 2012 20:52:26 +0000 (21:52 +0100)]
doc/filters: fix grammar mistake in setfield documentation

Spotted-by: Tim Nicholson <nichot20@yahoo.com>
7 years agolavr: temporarily store custom matrix in AVAudioResampleContext
Justin Ruggles [Thu, 29 Nov 2012 19:53:04 +0000 (14:53 -0500)]
lavr: temporarily store custom matrix in AVAudioResampleContext

This allows AudioMix to be treated the same way as other conversion contexts
and removes the requirement to allocate it at the same time as the
AVAudioResampleContext.

The current matrix get/set functions are split between the public interface
and AudioMix private functions.

7 years agolavr: clarify documentation for avresample_get/set_matrix()
Justin Ruggles [Thu, 29 Nov 2012 19:59:19 +0000 (14:59 -0500)]
lavr: clarify documentation for avresample_get/set_matrix()

7 years agolavfi/fps: remove parse opt error message.
Clément Bœsch [Tue, 11 Dec 2012 17:14:08 +0000 (18:14 +0100)]
lavfi/fps: remove parse opt error message.

See cc650cf0 for more info.

7 years agodoc/filters: extend fps documentation.
Clément Bœsch [Tue, 11 Dec 2012 17:11:25 +0000 (18:11 +0100)]
doc/filters: extend fps documentation.

7 years agolavfi/fps: add shorthand.
Clément Bœsch [Tue, 11 Dec 2012 17:12:07 +0000 (18:12 +0100)]
lavfi/fps: add shorthand.

7 years agomxfdec: drop unneeded extradata padding
Michael Niedermayer [Tue, 11 Dec 2012 13:47:40 +0000 (14:47 +0100)]
mxfdec: drop unneeded extradata padding

Found-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswfdec: cosmetics: fix indentation
Justin Ruggles [Mon, 10 Dec 2012 17:48:18 +0000 (12:48 -0500)]
swfdec: cosmetics: fix indentation