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

7 years agoswfdec: do better validation of tag length
Justin Ruggles [Mon, 10 Dec 2012 17:44:09 +0000 (12:44 -0500)]
swfdec: do better validation of tag length

Avoids trying to read a packet with 0 or negative size.
Avoids a potential infinite loop due to seeking backwards.

Partially based on a patch by Michael Niedermayer.

7 years agomxfdec: fix leak of extradata
Michael Niedermayer [Tue, 11 Dec 2012 13:43:47 +0000 (14:43 +0100)]
mxfdec: fix leak of extradata

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMake LOCAL_ALIGNED syntactically similar on all systems
Mans Rullgard [Fri, 7 Dec 2012 23:03:01 +0000 (23:03 +0000)]
Make LOCAL_ALIGNED syntactically similar on all systems

This changes the LOCAL_ALIGNED definition on systems where
DECLARE_ALIGNED is used so it matches the manual alignment
case, ensuring invalid use will not compile on x86 only to
fail on everything else.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agofilters.texi: document more aresample options
Michael Niedermayer [Tue, 11 Dec 2012 11:48:46 +0000 (12:48 +0100)]
filters.texi: document more aresample options

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosvq3: fix cast type to be independant of "sizeof(int)"
Michael Niedermayer [Tue, 11 Dec 2012 09:22:01 +0000 (10:22 +0100)]
svq3: fix cast type to be independant of "sizeof(int)"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: fix dca encoder dependencies
Paul B Mahol [Tue, 11 Dec 2012 11:45:22 +0000 (11:45 +0000)]
build: fix dca encoder dependencies

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofate: add BRSTM demuxer test
Paul B Mahol [Mon, 10 Dec 2012 12:59:49 +0000 (12:59 +0000)]
fate: add BRSTM demuxer test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoiff decoder: support RGB8 and RGBN
Peter Ross [Thu, 29 Nov 2012 23:44:36 +0000 (10:44 +1100)]
iff decoder: support RGB8 and RGBN

7 years agoiff demuxer: support RGB8 and RGBN
Peter Ross [Thu, 29 Nov 2012 23:42:15 +0000 (10:42 +1100)]
iff demuxer: support RGB8 and RGBN

7 years agolavf: remove unneeded pb check
Michael Niedermayer [Tue, 11 Dec 2012 08:34:47 +0000 (09:34 +0100)]
lavf: remove unneeded pb check

Fixes CID747727
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoastenc: fix assignment vs compare
Michael Niedermayer [Tue, 11 Dec 2012 07:56:42 +0000 (08:56 +0100)]
astenc: fix assignment vs compare

Fixes CID747736
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: fix memleak
Michael Niedermayer [Tue, 11 Dec 2012 07:51:34 +0000 (08:51 +0100)]
lavf: fix memleak

Fixes CID747738
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 11 Dec 2012 07:24:45 +0000 (08:24 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: fix 'clean' target
  ZeroCodec: Flip output

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: remove mp=denoise3d filter.
Clément Bœsch [Mon, 3 Dec 2012 21:20:52 +0000 (22:20 +0100)]
lavfi: remove mp=denoise3d filter.

hqdn3d was meant to be a more efficient denoise3d filter, is supported
natively, and is faster on my computer thanks to the ASM optimisations.

7 years agodoc: fix a -map syntax in one command line example.
Clément Bœsch [Tue, 11 Dec 2012 02:57:33 +0000 (03:57 +0100)]
doc: fix a -map syntax in one command line example.

7 years agobuild: fix prores decoder dependencies.
Clément Bœsch [Tue, 11 Dec 2012 01:52:55 +0000 (02:52 +0100)]
build: fix prores decoder dependencies.

According to lavc/proresdsp.c, both prores and prores-lgpl decoders need
lavc/x86/proresdsp_init.c:ff_proresdsp_x86_init().

7 years agodoxy: add ref for lavfi, lpp and lsws.
Clément Bœsch [Tue, 11 Dec 2012 01:13:43 +0000 (02:13 +0100)]
doxy: add ref for lavfi, lpp and lsws.

7 years agodoxy: fix swr group name
Michael Niedermayer [Tue, 11 Dec 2012 00:53:01 +0000 (01:53 +0100)]
doxy: fix swr group name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoPrint bpc (for bits per component) with pixel format if it is smaller than expected.
Carl Eugen Hoyos [Tue, 11 Dec 2012 00:26:32 +0000 (01:26 +0100)]
Print bpc (for bits per component) with pixel format if it is smaller than expected.

7 years agolavf/segment: add reset_timestamps option
Stefano Sabatini [Thu, 29 Nov 2012 12:45:50 +0000 (13:45 +0100)]
lavf/segment: add reset_timestamps option

The new options reset the timestamps at each new segment, so that the
generated segments will have timestamps starting close to 0.

It is meant to address trac ticket #1425.

7 years agoopt: fix memleak on error of range_array
Michael Niedermayer [Mon, 10 Dec 2012 23:00:54 +0000 (00:00 +0100)]
opt: fix memleak on error of range_array

Fixes CID747739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohttp: dont null check p, its unneeded
Michael Niedermayer [Mon, 10 Dec 2012 22:58:26 +0000 (23:58 +0100)]
http: dont null check p, its unneeded

Fixes CID747740
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_tinterlace: default of mode switch is impossible, add assert.
Michael Niedermayer [Mon, 10 Dec 2012 22:55:21 +0000 (23:55 +0100)]
vf_tinterlace: default of mode switch is impossible, add assert.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavcodec/x86/mpegvideo: switch to av_assert2
Michael Niedermayer [Mon, 10 Dec 2012 21:48:29 +0000 (22:48 +0100)]
libavcodec/x86/mpegvideo: switch to av_assert2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoitu H.263: Fix handling of PB blocks
Michael Niedermayer [Mon, 10 Dec 2012 22:20:47 +0000 (23:20 +0100)]
itu H.263: Fix handling of PB blocks

This fixes artifacts in Ticket744

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: dont try to allocate scratchpad if linesize is not known
Michael Niedermayer [Mon, 10 Dec 2012 19:51:32 +0000 (20:51 +0100)]
h264: dont try to allocate scratchpad if linesize is not known

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: fix 'clean' target
Mans Rullgard [Mon, 10 Dec 2012 14:55:28 +0000 (14:55 +0000)]
build: fix 'clean' target

This fixes removal of TOOLS as well as HOSTPROGS declared in the
top-level Makefile.  The clean target in common.mak needs to be
eval'd since the variables used within are reset for each library.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoswfdec: check lens validity
Michael Niedermayer [Mon, 10 Dec 2012 16:20:32 +0000 (17:20 +0100)]
swfdec: check lens validity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>