]> git.sesse.net Git - ffmpeg/log
ffmpeg
11 years agorawvideodec: set bit rate
Paul B Mahol [Tue, 4 Dec 2012 15:50:33 +0000 (15:50 +0000)]
rawvideodec: set bit rate

Fixes #1989.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agoffmpeg: small indent fix.
Clément Bœsch [Tue, 4 Dec 2012 15:40:11 +0000 (16:40 +0100)]
ffmpeg: small indent fix.

11 years agoffmpeg: use the correct variables in do_video_stats()
Michael Niedermayer [Tue, 4 Dec 2012 15:25:21 +0000 (16:25 +0100)]
ffmpeg: use the correct variables in do_video_stats()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoUpdate video stats log during encode flush
Thierry Foucu [Tue, 4 Dec 2012 06:01:38 +0000 (22:01 -0800)]
Update video stats log during encode flush

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agogifdec: do not handle timestamps
Paul B Mahol [Sat, 1 Dec 2012 11:37:18 +0000 (11:37 +0000)]
gifdec: do not handle timestamps

It is broken, and results will be messed up when seeking.

This also fix duration displayed for streams when using -c copy.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agoAdd debug output when skipping unknown swf tags.
Carl Eugen Hoyos [Tue, 4 Dec 2012 14:52:37 +0000 (15:52 +0100)]
Add debug output when skipping unknown swf tags.

Reviewed-by: Clément Bœsch
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 4 Dec 2012 13:23:22 +0000 (14:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: always use pic for shared libraries
  build: cosmetics: Move CONFIG_RTPDEC entry to a more suitable place
  fate: ea, h264: prettyprinting and ordering cosmetics

Conflicts:
tests/fate/ea.mak
tests/fate/h264.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoauenc: remove pointless assigment
Paul B Mahol [Tue, 4 Dec 2012 12:42:50 +0000 (12:42 +0000)]
auenc: remove pointless assigment

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agommf: return meaningful error codes
Paul B Mahol [Tue, 4 Dec 2012 11:59:46 +0000 (11:59 +0000)]
mmf: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agoAST Muxer
James Almer [Thu, 29 Nov 2012 16:14:50 +0000 (13:14 -0300)]
AST Muxer

Signed-off-by: James Almer <jamrial@gmail.com>
11 years agoast: Rename ast.c -> astdec.c
James Almer [Thu, 29 Nov 2012 16:12:33 +0000 (13:12 -0300)]
ast: Rename ast.c -> astdec.c

Signed-off-by: James Almer <jamrial@gmail.com>
11 years agoiff demuxer: include DEEP TVDC lookup table in extradata buffer
Peter Ross [Sun, 25 Nov 2012 04:12:56 +0000 (15:12 +1100)]
iff demuxer: include DEEP TVDC lookup table in extradata buffer

Signed-off-by: Peter Ross <pross@xvid.org>
11 years agoiff decoder: DEEP TVDC 32-bit decoder
Peter Ross [Fri, 23 Nov 2012 06:29:49 +0000 (17:29 +1100)]
iff decoder: DEEP TVDC 32-bit decoder

Signed-off-by: Peter Ross <pross@xvid.org>
11 years agoconfigure: Fix ARM thumb detection
Michael Niedermayer [Tue, 4 Dec 2012 04:35:11 +0000 (05:35 +0100)]
configure: Fix ARM thumb detection

The detection detects the default but not if it even works.
Check building a simple piece of code and disable thumb if it fails
This fixes a compile failure

If someone has a better idea, just replace this by it!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agomatroskadec: reset size when freeing data.
Michael Niedermayer [Tue, 4 Dec 2012 02:30:40 +0000 (03:30 +0100)]
matroskadec: reset size when freeing data.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavfi/mp: fix invalid read with filters with no argument.
Clément Bœsch [Tue, 4 Dec 2012 02:45:52 +0000 (03:45 +0100)]
lavfi/mp: fix invalid read with filters with no argument.

11 years agolavfi/removelogo: switch to ff_filter_frame.
Clément Bœsch [Sun, 2 Dec 2012 01:21:44 +0000 (02:21 +0100)]
lavfi/removelogo: switch to ff_filter_frame.

11 years agolavfi: add subtitles filter.
Clément Bœsch [Thu, 29 Nov 2012 02:28:37 +0000 (03:28 +0100)]
lavfi: add subtitles filter.

11 years agoppc: always use pic for shared libraries
Luca Barbato [Mon, 3 Dec 2012 21:53:30 +0000 (22:53 +0100)]
ppc: always use pic for shared libraries

CC: libav-stable@libav.org
11 years agolavfi: remove some video w/h settings after avfilter_copy_buffer_ref_props.
Clément Bœsch [Mon, 3 Dec 2012 20:47:01 +0000 (21:47 +0100)]
lavfi: remove some video w/h settings after avfilter_copy_buffer_ref_props.

video->[wh] will be set with the same values as the input after
avfilter_copy_buffer_ref_props. These filters don't change the size of
the input so there is no need for this code.

11 years agolavfi/gradfun: remove check for AV_PERM_PRESERVE.
Clément Bœsch [Mon, 3 Dec 2012 19:38:27 +0000 (20:38 +0100)]
lavfi/gradfun: remove check for AV_PERM_PRESERVE.

This check does not make sense in this context, see
doc/filter_design.txt for details about the usage of such flag.

11 years agolibspeex: allow custom sample rates again.
Reimar Döffinger [Wed, 28 Nov 2012 15:39:07 +0000 (16:39 +0100)]
libspeex: allow custom sample rates again.

This was broken by 3b061c5e10f78caaf3b2a45cf7a92e50d4d20bfb
Fixes trac issue #1974.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
11 years agobuild: cosmetics: Move CONFIG_RTPDEC entry to a more suitable place
Diego Biurrun [Thu, 29 Nov 2012 18:20:56 +0000 (19:20 +0100)]
build: cosmetics: Move CONFIG_RTPDEC entry to a more suitable place

11 years agompegts: check that codec is not open in mpegts_find_stream_type
Michael Niedermayer [Mon, 3 Dec 2012 16:34:38 +0000 (17:34 +0100)]
mpegts: check that codec is not open in mpegts_find_stream_type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agompegts_set_stream_info: remove unneeded codec id check
Michael Niedermayer [Mon, 3 Dec 2012 16:29:56 +0000 (17:29 +0100)]
mpegts_set_stream_info: remove unneeded codec id check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoff_mp4_read_dec_config_descr: check that the codec is not open
Michael Niedermayer [Mon, 3 Dec 2012 16:27:19 +0000 (17:27 +0100)]
ff_mp4_read_dec_config_descr: check that the codec is not open

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodoc: describe micro versioning policy
Peter Ross [Mon, 3 Dec 2012 11:27:08 +0000 (22:27 +1100)]
doc: describe micro versioning policy

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agotakdec: add .sample_fmts
Paul B Mahol [Mon, 3 Dec 2012 15:21:19 +0000 (15:21 +0000)]
takdec: add .sample_fmts

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agoshorten: update .sample_fmts
Paul B Mahol [Mon, 3 Dec 2012 15:13:35 +0000 (15:13 +0000)]
shorten: update .sample_fmts

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agofate: ea, h264: prettyprinting and ordering cosmetics
Diego Biurrun [Wed, 28 Nov 2012 16:54:07 +0000 (17:54 +0100)]
fate: ea, h264: prettyprinting and ordering cosmetics

11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 3 Dec 2012 14:28:35 +0000 (15:28 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Strip ordinals from mingw generated def files
  configure: arm: detect default thumb state of compiler

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolswr/swresample: use AV_OPT_TYPE_SAMPLE_FMT for sample format options
Stefano Sabatini [Sun, 4 Nov 2012 14:45:09 +0000 (15:45 +0100)]
lswr/swresample: use AV_OPT_TYPE_SAMPLE_FMT for sample format options

Improve usability and robustness.

11 years agoconfigure: Strip ordinals from mingw generated def files
Martin Storsjö [Sat, 17 Nov 2012 14:34:54 +0000 (16:34 +0200)]
configure: Strip ordinals from mingw generated def files

The def files are used for generating import libraries for
other toolchains (in particular, for generating import libraries
for MSVC for DLLs built with mingw).

The def files produced by mingw/gcc contains ordinals for each
exported function. When MSVC tools generate import libraries
from such a def file, MSVC links to the DLL by the ordinals
instead of linking by name.

Since the def files aren't maintained by hand, the ordinal
numbers are assigned (more or less) randomly and any caller
linking to the libs by ordinals will break as soon as the libraries
export more/fewer functions.

Therefore, strip out the ordinals from the generated def files,
to make users link to the libraries by name.

Callers linking to the DLLs using the gcc provided import library
link by name as they should.

Signed-off-by: Martin Storsjö <martin@martin.st>
11 years agoconfigure: arm: detect default thumb state of compiler
Mans Rullgard [Fri, 30 Nov 2012 21:58:42 +0000 (21:58 +0000)]
configure: arm: detect default thumb state of compiler

This makes configure honour the compiler default if thumb is not
explicitly enabled or disabled.

Signed-off-by: Mans Rullgard <mans@mansr.com>
11 years agora144enc: reject unsupported sample rates
Piotr Bandurski [Mon, 3 Dec 2012 10:03:27 +0000 (10:03 +0000)]
ra144enc: reject unsupported sample rates

11 years agofate: fix typos in wtv seek test
Michael Niedermayer [Mon, 3 Dec 2012 02:15:41 +0000 (03:15 +0100)]
fate: fix typos in wtv seek test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 3 Dec 2012 01:59:19 +0000 (02:59 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: fft: Fix libavcodec dependency
  build: Make the ISMV muxer select the MOV muxer
  configure: move arm arch extensions to a separate variable

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'
Michael Niedermayer [Mon, 3 Dec 2012 01:21:08 +0000 (02:21 +0100)]
Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

* commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6':
  fate-seek: remove use of gnu make 3.82 only private modifier
  fate: move vsynth reference files to their own directory
  fate: move fate-acodec reference files to their own dir
  configure: avplay now depends on avresample
  fate: split dependencies for fate-seek tests

Conflicts:
configure
tests/fate/seek.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16'
Michael Niedermayer [Mon, 3 Dec 2012 00:56:47 +0000 (01:56 +0100)]
Merge commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16'

* commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16':
  h264: error out on unset current_picture_ptr for h->current_slice > 0
  avprobe: report per stream bit rate if set by the decoder
  aac: avoid a memcpy in sbr_qmf_analysis

Conflicts:
avprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agovp56: Ignore reconfiguration from the alpha plane.
Michael Niedermayer [Mon, 3 Dec 2012 00:26:23 +0000 (01:26 +0100)]
vp56: Ignore reconfiguration from the alpha plane.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agofate: fft: Fix libavcodec dependency
Diego Biurrun [Wed, 28 Nov 2012 23:22:25 +0000 (00:22 +0100)]
fate: fft: Fix libavcodec dependency

11 years agobuild: Make the ISMV muxer select the MOV muxer
Diego Biurrun [Sat, 1 Dec 2012 16:56:00 +0000 (17:56 +0100)]
build: Make the ISMV muxer select the MOV muxer

They share the same code, so building one w/o the other makes no sense.

11 years agoconfigure: move arm arch extensions to a separate variable
Mans Rullgard [Sat, 1 Dec 2012 12:26:12 +0000 (12:26 +0000)]
configure: move arm arch extensions to a separate variable

Signed-off-by: Mans Rullgard <mans@mansr.com>
11 years agofate-seek: remove use of gnu make 3.82 only private modifier
Janne Grunau [Sun, 2 Dec 2012 23:37:07 +0000 (00:37 +0100)]
fate-seek: remove use of gnu make 3.82 only private modifier

11 years agofate: move vsynth reference files to their own directory
Janne Grunau [Sun, 2 Dec 2012 23:36:10 +0000 (00:36 +0100)]
fate: move vsynth reference files to their own directory

11 years agofate: move fate-acodec reference files to their own dir
Janne Grunau [Sun, 2 Dec 2012 23:29:35 +0000 (00:29 +0100)]
fate: move fate-acodec reference files to their own dir

11 years agoconfigure: avplay now depends on avresample
Diego Biurrun [Wed, 28 Nov 2012 23:14:23 +0000 (00:14 +0100)]
configure: avplay now depends on avresample

11 years agofate: split dependencies for fate-seek tests
Janne Grunau [Sun, 2 Dec 2012 19:31:20 +0000 (20:31 +0100)]
fate: split dependencies for fate-seek tests

Each fate-seek test depends now only on the corresponding fate-acodec,
fate-vsynth2 or fate-lavf test which creates the file seek-tests
operates on. The tests and references are renamed to match the test they
depend on.

11 years agoh264: error out on unset current_picture_ptr for h->current_slice > 0
Janne Grunau [Wed, 21 Nov 2012 18:41:59 +0000 (19:41 +0100)]
h264: error out on unset current_picture_ptr for h->current_slice > 0

Fixes a segfault with fuzzed sample sample_varPAR_s11622_r001-02.avi.

CC: libav-stable@libav.org
11 years agoavprobe: report per stream bit rate if set by the decoder
Janne Grunau [Fri, 30 Nov 2012 14:44:19 +0000 (15:44 +0100)]
avprobe: report per stream bit rate if set by the decoder

11 years agowtvdec: fix null pointer dereference
Michael Niedermayer [Sun, 2 Dec 2012 21:36:15 +0000 (22:36 +0100)]
wtvdec: fix null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoaac: avoid a memcpy in sbr_qmf_analysis
Christophe Gisquet [Wed, 28 Nov 2012 21:47:25 +0000 (22:47 +0100)]
aac: avoid a memcpy in sbr_qmf_analysis

Swapping buffer indices allows saving one memcpy that accounts for 1% of the
runtime, according to oprofile.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years agoasfdec: check extradata size before alloc and read
Michael Niedermayer [Sun, 2 Dec 2012 19:37:09 +0000 (20:37 +0100)]
asfdec: check extradata size before alloc and read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoh264: check for integer overflow, fix null pointer dereference
Michael Niedermayer [Sun, 2 Dec 2012 19:36:32 +0000 (20:36 +0100)]
h264: check for integer overflow, fix null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavu/channel_layout: document the semantic of layouts.
Nicolas George [Wed, 28 Nov 2012 11:05:24 +0000 (12:05 +0100)]
lavu/channel_layout: document the semantic of layouts.

11 years agolavfi/bbox: switch to ff_filter_frame() API
Stefano Sabatini [Sun, 2 Dec 2012 17:13:49 +0000 (18:13 +0100)]
lavfi/bbox: switch to ff_filter_frame() API

11 years agolavfi/alphamerge: fix leak introduced in 217163eb
Stefano Sabatini [Sun, 2 Dec 2012 17:03:04 +0000 (18:03 +0100)]
lavfi/alphamerge: fix leak introduced in 217163eb

11 years agogifdec: read pixel aspect ratio
Paul B Mahol [Sat, 1 Dec 2012 12:36:16 +0000 (12:36 +0000)]
gifdec: read pixel aspect ratio

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agolavfi/vf_super2xsai: fix output ref size.
Nicolas George [Sun, 2 Dec 2012 16:08:17 +0000 (17:08 +0100)]
lavfi/vf_super2xsai: fix output ref size.

11 years agolavfi/framestep: switch to ff_filter_frame API
Stefano Sabatini [Sun, 2 Dec 2012 01:02:47 +0000 (02:02 +0100)]
lavfi/framestep: switch to ff_filter_frame API

11 years agolavfi/super2xsai: switch to ff_filter_frame() API
Stefano Sabatini [Sun, 2 Dec 2012 00:53:02 +0000 (01:53 +0100)]
lavfi/super2xsai: switch to ff_filter_frame() API

11 years agolavfi/hue: move to ff_filter_frame.
Clément Bœsch [Sun, 2 Dec 2012 00:11:48 +0000 (01:11 +0100)]
lavfi/hue: move to ff_filter_frame.

11 years agofate: add hue filter test.
Clément Bœsch [Sun, 2 Dec 2012 00:49:59 +0000 (01:49 +0100)]
fate: add hue filter test.

11 years agolavfi/vf_tile: forward errors.
Nicolas George [Thu, 29 Nov 2012 16:13:06 +0000 (17:13 +0100)]
lavfi/vf_tile: forward errors.

11 years agolavfi/vf_tile: cosmetic after last commit.
Nicolas George [Thu, 29 Nov 2012 16:10:05 +0000 (17:10 +0100)]
lavfi/vf_tile: cosmetic after last commit.

11 years agolavfi/vf_tile: switch to filter_frame.
Nicolas George [Thu, 29 Nov 2012 16:08:30 +0000 (17:08 +0100)]
lavfi/vf_tile: switch to filter_frame.

Also add error check on buffer allocation.

11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 2 Dec 2012 12:47:07 +0000 (13:47 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: fix indentation in option parsing loop

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavfi/decimate: switch to ff_filter_frame() API
Stefano Sabatini [Sun, 2 Dec 2012 00:20:31 +0000 (01:20 +0100)]
lavfi/decimate: switch to ff_filter_frame() API

11 years agolavfi/alphamerge: switch to ff_filter_frame() API
Stefano Sabatini [Sun, 2 Dec 2012 00:11:52 +0000 (01:11 +0100)]
lavfi/alphamerge: switch to ff_filter_frame() API

11 years agolavfi/blackdetect: switch to new ff_filter_frame() API
Stefano Sabatini [Sat, 1 Dec 2012 23:58:59 +0000 (00:58 +0100)]
lavfi/blackdetect: switch to new ff_filter_frame() API

11 years agolavu/parseutils: accept %J for hours >= 24.
Nicolas George [Sat, 1 Dec 2012 15:58:51 +0000 (16:58 +0100)]
lavu/parseutils: accept %J for hours >= 24.

Allow to parse durations >= 24:00:00.

11 years agompc8: check seektable size before attempting to use it.
Michael Niedermayer [Sun, 2 Dec 2012 03:21:42 +0000 (04:21 +0100)]
mpc8: check seektable size before attempting to use it.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodcadec: fix reading from prior to an array
Michael Niedermayer [Sun, 2 Dec 2012 03:00:50 +0000 (04:00 +0100)]
dcadec: fix reading from prior to an array

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavfi/hqdn3d: avoid use of uninitialized variable.
Clément Bœsch [Sun, 2 Dec 2012 01:53:22 +0000 (02:53 +0100)]
lavfi/hqdn3d: avoid use of uninitialized variable.

11 years agolavfi/gradfun: avoid use of uninitialized variable.
Clément Bœsch [Sun, 2 Dec 2012 01:25:09 +0000 (02:25 +0100)]
lavfi/gradfun: avoid use of uninitialized variable.

11 years agoxxan: more complete ybuf checks, fix out of array accesses.
Michael Niedermayer [Sat, 1 Dec 2012 22:20:48 +0000 (23:20 +0100)]
xxan: more complete ybuf checks, fix out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoAdd FourCC V264 for H264 in CCTV recordings.
Carl Eugen Hoyos [Sat, 1 Dec 2012 23:43:39 +0000 (00:43 +0100)]
Add FourCC V264 for H264 in CCTV recordings.

11 years agolavfi/vsrc: switch to ff_filter_frame.
Clément Bœsch [Sat, 1 Dec 2012 00:24:21 +0000 (01:24 +0100)]
lavfi/vsrc: switch to ff_filter_frame.

11 years agoconfigure: fix indentation in option parsing loop
Mans Rullgard [Thu, 29 Nov 2012 18:03:50 +0000 (18:03 +0000)]
configure: fix indentation in option parsing loop

Signed-off-by: Mans Rullgard <mans@mansr.com>
11 years agolavf/assdec: return appropriate error code instead of -1.
Clément Bœsch [Fri, 23 Nov 2012 21:47:51 +0000 (22:47 +0100)]
lavf/assdec: return appropriate error code instead of -1.

11 years agolavf/assdec: add ass_ prefix to callbacks.
Clément Bœsch [Fri, 23 Nov 2012 21:47:09 +0000 (22:47 +0100)]
lavf/assdec: add ass_ prefix to callbacks.

11 years agolavf/assdec: rewrite using the demux subtitles API.
Clément Bœsch [Fri, 23 Nov 2012 21:45:05 +0000 (22:45 +0100)]
lavf/assdec: rewrite using the demux subtitles API.

11 years agolavf: use ff_subtitles_queue_seek() for text subtitles demuxers.
Clément Bœsch [Fri, 23 Nov 2012 20:43:54 +0000 (21:43 +0100)]
lavf: use ff_subtitles_queue_seek() for text subtitles demuxers.

11 years agolavf/subtitles: seek a little more backward when necessary.
Clément Bœsch [Fri, 30 Nov 2012 06:00:59 +0000 (07:00 +0100)]
lavf/subtitles: seek a little more backward when necessary.

If some previous subtitles are overlapping with the current time
we make sure they are raised so the renderer can display them too.

11 years agolavf/subtitles: add ff_subtitles_queue_seek().
Clément Bœsch [Fri, 23 Nov 2012 20:40:46 +0000 (21:40 +0100)]
lavf/subtitles: add ff_subtitles_queue_seek().

This function is almost identical to lavf/assdec:read_seek2(). It
performs a generic seek for text subtitles demuxers for the new seeking
API.

The only difference with assdec:read_seek2 is the ts_diff being
unsigned to avoid overflows.

The seek callback in the ASS demuxer will be removed when it is
redesigned to use FFDemuxSubtitlesQueue.

11 years agoffmpeg: use avformat_seek_file() instead of av_seek_frame().
Clément Bœsch [Fri, 23 Nov 2012 20:11:49 +0000 (21:11 +0100)]
ffmpeg: use avformat_seek_file() instead of av_seek_frame().

avformat_seek_file() is the new API. It will make sure the read_seek2()
callback is called when the demuxer has it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
11 years agovmnc: Check for integer overflow
Michael Niedermayer [Sat, 1 Dec 2012 21:09:14 +0000 (22:09 +0100)]
vmnc: Check for integer overflow

Fixes null pointer dereference and potential out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodcadec: check lfe field
Michael Niedermayer [Sat, 1 Dec 2012 20:42:02 +0000 (21:42 +0100)]
dcadec: check lfe field

Fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoPVF demuxer
Paul B Mahol [Fri, 30 Nov 2012 16:49:24 +0000 (16:49 +0000)]
PVF demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agoSupport Sorenson Spark in f4v files streamed by Flash Media Server.
Carl Eugen Hoyos [Sat, 1 Dec 2012 20:16:11 +0000 (21:16 +0100)]
Support Sorenson Spark in f4v files streamed by Flash Media Server.

11 years agomxfdec: check index_tables before dereferencing in close.
Michael Niedermayer [Sat, 1 Dec 2012 19:15:02 +0000 (20:15 +0100)]
mxfdec: check index_tables before dereferencing in close.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agosvq1dec: update w/h only if the header is successfully parsed.
Michael Niedermayer [Sat, 1 Dec 2012 18:16:19 +0000 (19:16 +0100)]
svq1dec: update w/h only if the header is successfully parsed.

Prevents inconsistency and out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavu/opt: allow to set sample and pixel format with av_opt_set_int()
Stefano Sabatini [Sat, 1 Dec 2012 00:07:24 +0000 (01:07 +0100)]
lavu/opt: allow to set sample and pixel format with av_opt_set_int()

This change requires the user to specify min and max value, and makes
possible to prevent the user to set AV_{SAMPLE,PIX}_FMT_NONE if
forbidden.

Add required ifdeffery in case of mixed libraries, when libavutil is
updated but not the other libraries.

This is a followup of 08d0969c1402ccec4dce44bd430128fb59d7b790.

11 years agofate/mp3: increase fuzz for NEON, due to different rounding from lrintf()
Michael Niedermayer [Sat, 1 Dec 2012 16:02:04 +0000 (17:02 +0100)]
fate/mp3: increase fuzz for NEON, due to different rounding from lrintf()

This should fix fate failures of the hecommon test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavfi/geq: add T variable and example
Stefano Sabatini [Sat, 1 Dec 2012 11:47:51 +0000 (12:47 +0100)]
lavfi/geq: add T variable and example

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

* qatar/master:
  configure: Use headers in the check for _beginthreadex for w32threads
  avutil: Use a configure check to enable windows console functions
  avutil: Include io.h with a separate condition from windows console functions

Conflicts:
libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodoc/ffmpeg-filters: add short description
Stefano Sabatini [Sat, 1 Dec 2012 12:05:25 +0000 (13:05 +0100)]
doc/ffmpeg-filters: add short description

11 years agotests/ref/seek/lavf_gif: update for 9d5cfce85540: gifdec: rudimentary seeking
Michael Niedermayer [Sat, 1 Dec 2012 11:56:12 +0000 (12:56 +0100)]
tests/ref/seek/lavf_gif: update for 9d5cfce85540: gifdec: rudimentary seeking

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agogifdec: rudimentary seeking
Paul B Mahol [Sat, 1 Dec 2012 11:07:50 +0000 (11:07 +0000)]
gifdec: rudimentary seeking

With this ffplay -loop X successfully seeks to start.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agogifdec: use av_fast_malloc()
Paul B Mahol [Sat, 1 Dec 2012 10:53:22 +0000 (10:53 +0000)]
gifdec: use av_fast_malloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>