ffmpeg.git
7 years agolavfi/overlay: clarify/fix comment, add a few empty lines to ease readability
Stefano Sabatini [Sat, 15 Dec 2012 12:09:26 +0000 (13:09 +0100)]
lavfi/overlay: clarify/fix comment, add a few empty lines to ease readability

7 years agolavfi/overlay: remove duplicated definition of ff_null_get_video_buffer()
Stefano Sabatini [Sat, 15 Dec 2012 12:44:06 +0000 (13:44 +0100)]
lavfi/overlay: remove duplicated definition of ff_null_get_video_buffer()

Simplify.

7 years agolavfi/avfilter.h: clarify doxy for AVFilterLink.out_buf
Stefano Sabatini [Sat, 15 Dec 2012 12:40:35 +0000 (13:40 +0100)]
lavfi/avfilter.h: clarify doxy for AVFilterLink.out_buf

7 years agoMerge commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d'
Michael Niedermayer [Sat, 15 Dec 2012 12:41:06 +0000 (13:41 +0100)]
Merge commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d'

* commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d':
  vp56: make parse_header return standard error codes

Conflicts:
libavcodec/vp56.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: update fate for 1a490df12fd9
Michael Niedermayer [Sat, 15 Dec 2012 11:41:24 +0000 (12:41 +0100)]
fate: update fate for 1a490df12fd9

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/APIchanges: fill empty git commit hashes and dates
Stefano Sabatini [Sat, 15 Dec 2012 10:41:12 +0000 (11:41 +0100)]
doc/APIchanges: fill empty git commit hashes and dates

7 years agoffprobe: show pkt_size in frame
Stefano Sabatini [Fri, 14 Dec 2012 10:59:13 +0000 (11:59 +0100)]
ffprobe: show pkt_size in frame

Fix trac ticket #2027.

7 years agolavc: add pkt_size field to AVFrame
Stefano Sabatini [Fri, 14 Dec 2012 10:58:21 +0000 (11:58 +0100)]
lavc: add pkt_size field to AVFrame

7 years agofate: check if rsync has the contimeout option
Jean First [Wed, 7 Nov 2012 10:27:06 +0000 (11:27 +0100)]
fate: check if rsync has the contimeout option

rsync on osx misses the --contimeout option

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflashsv2_prime: check block before using it.
Michael Niedermayer [Fri, 14 Dec 2012 23:19:20 +0000 (00:19 +0100)]
flashsv2_prime: check block before using it.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodcadec: check xch_base_channel against channel_order_tab.
Michael Niedermayer [Fri, 14 Dec 2012 22:37:14 +0000 (23:37 +0100)]
dcadec: check xch_base_channel against channel_order_tab.

Fix null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomp3on4: fix null pointer dereference
Michael Niedermayer [Fri, 14 Dec 2012 20:50:23 +0000 (21:50 +0100)]
mp3on4: fix null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodnxhddec: fix CID changed check.
Michael Niedermayer [Fri, 14 Dec 2012 19:57:25 +0000 (20:57 +0100)]
dnxhddec: fix CID changed check.

Fixes Null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: update asyncts reference
Michael Niedermayer [Fri, 14 Dec 2012 17:53:38 +0000 (18:53 +0100)]
fate: update asyncts reference

We cannot update the existing file because this would break
ffmpeg 1.0, which uses it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/segment: provide more debug feedback when a new segment starts
Stefano Sabatini [Thu, 13 Dec 2012 20:19:25 +0000 (21:19 +0100)]
lavf/segment: provide more debug feedback when a new segment starts

7 years agolavf/segment: add missing flags to segmenter option constants
Stefano Sabatini [Fri, 14 Dec 2012 10:44:31 +0000 (11:44 +0100)]
lavf/segment: add missing flags to segmenter option constants

7 years agoass_split_section: dont overread array
Michael Niedermayer [Fri, 14 Dec 2012 17:10:19 +0000 (18:10 +0100)]
ass_split_section: dont overread array

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowestwood_vqa: fix null pointer dereference
Michael Niedermayer [Fri, 14 Dec 2012 16:55:25 +0000 (17:55 +0100)]
westwood_vqa: fix null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 14 Dec 2012 14:57:53 +0000 (15:57 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ivi_common: check that scan pattern is set before using it.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'
Michael Niedermayer [Fri, 14 Dec 2012 14:53:48 +0000 (15:53 +0100)]
Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'

* commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd':
  ivi_common: use proper logging context in ivi_decode_blocks().
  ivi_common: make some functions and tables static.
  asyncts: ignore min_delta only if first_pts is set

Conflicts:
libavcodec/ivi_common.c
libavcodec/ivi_common.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'
Michael Niedermayer [Fri, 14 Dec 2012 14:42:58 +0000 (15:42 +0100)]
Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'

* commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f':
  asyncts: merge two conditions
  x86inc: fully concatenate tokens to fix macro expansion for nasm
  h264: initialize frame-mt context copies properly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13'
Michael Niedermayer [Fri, 14 Dec 2012 14:36:37 +0000 (15:36 +0100)]
Merge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13'

* commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13':
  mpegvideo: treat delayed pictures as used

Conflicts:
libavcodec/h264.h

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

* commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c':
  lavc: set frame parameters after decoding only if necessary

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: remove low_delay/has_b_frame setting code from nal loop
Michael Niedermayer [Fri, 14 Dec 2012 14:22:19 +0000 (15:22 +0100)]
h264: remove low_delay/has_b_frame setting code from nal loop

This code is now executed in h264_set_parameter_from_sps()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '072be3e8969f24113d599444be4d6a0ed04a6602'
Michael Niedermayer [Fri, 14 Dec 2012 14:00:28 +0000 (15:00 +0100)]
Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'

* commit '072be3e8969f24113d599444be4d6a0ed04a6602':
  h264: set parameters from SPS whenever it changes
  asyncts: cosmetics: reindent

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 agovp56: make parse_header return standard error codes
Luca Barbato [Fri, 14 Dec 2012 07:22:06 +0000 (08:22 +0100)]
vp56: make parse_header return standard error codes

Returning 0 for failure is misleading.

CC: libav-stable@libav.org
7 years agoivi_common: check that scan pattern is set before using it.
Anton Khirnov [Thu, 13 Dec 2012 18:38:20 +0000 (19:38 +0100)]
ivi_common: check that scan pattern is set before using it.

Fixes CVE-2012-2791.

CC: libav-stable@libav.org
7 years agoivi_common: use proper logging context in ivi_decode_blocks().
Anton Khirnov [Thu, 13 Dec 2012 18:31:42 +0000 (19:31 +0100)]
ivi_common: use proper logging context in ivi_decode_blocks().

7 years agoivi_common: make some functions and tables static.
Anton Khirnov [Thu, 13 Dec 2012 18:25:52 +0000 (19:25 +0100)]
ivi_common: make some functions and tables static.

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 agoasyncts: merge two conditions
Justin Ruggles [Thu, 13 Dec 2012 18:20:51 +0000 (13:20 -0500)]
asyncts: merge two conditions

7 years agoasyncts: ignore min_delta only if first_pts is set
Justin Ruggles [Thu, 13 Dec 2012 23:30:20 +0000 (18:30 -0500)]
asyncts: ignore min_delta only if first_pts is set

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 agox86inc: fully concatenate tokens to fix macro expansion for nasm
Janne Grunau [Thu, 13 Dec 2012 21:42:11 +0000 (22:42 +0100)]
x86inc: fully concatenate tokens to fix macro expansion for nasm

Fixes build errors with nasm introduced in 6f40e9f070f7 for stack
memory alignment. Noticed by BugMaster.

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 agompegvideo: treat delayed pictures as used
Janne Grunau [Wed, 12 Dec 2012 15:42:05 +0000 (16:42 +0100)]
mpegvideo: treat delayed pictures as used

This requires to move the avcodec_default_free_buffers() call to
ff_MPV_common_end() since otherwise delayed pictures would get freed
during a size change.

7 years agolavc: set frame parameters after decoding only if necessary
Janne Grunau [Wed, 12 Dec 2012 15:36:20 +0000 (16:36 +0100)]
lavc: set frame parameters after decoding only if necessary

Direct rendering capable decoders call get_buffer() which will set the
frame parameters.

Prevents frames with wrong parameters when a decoder outputs delayed
frames after a resolution or pixel format change.

7 years agoh264: set parameters from SPS whenever it changes
Janne Grunau [Fri, 16 Nov 2012 00:12:40 +0000 (01:12 +0100)]
h264: set parameters from SPS whenever it changes

Fixes a crash in the fuzzed sample sample_varPAR.avi_s26638 with
alternating bit depths.

7 years agoh264: initialize frame-mt context copies properly
Janne Grunau [Sun, 9 Dec 2012 18:19:51 +0000 (19:19 +0100)]
h264: initialize frame-mt context copies properly

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: cosmetics: reindent
Justin Ruggles [Thu, 13 Dec 2012 16:55:40 +0000 (11:55 -0500)]
asyncts: cosmetics: reindent

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>