ffmpeg.git
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 1 Apr 2013 10:29:44 +0000 (12:29 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  oma: Validate sample rates

Conflicts:
libavformat/oma.c

See: a30165c4a8044e1d5527c1302b5a5cb473e0913d

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: Grammar fixes for strem specifiers section
Derek Buitenhuis [Sat, 30 Mar 2013 19:26:21 +0000 (15:26 -0400)]
doc: Grammar fixes for strem specifiers section

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agodoc: Fix broken English in the common options description
Derek Buitenhuis [Sat, 30 Mar 2013 19:21:36 +0000 (15:21 -0400)]
doc: Fix broken English in the common options description

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agodoc: Grammar fixes for stream selection
Derek Buitenhuis [Sat, 30 Mar 2013 19:16:49 +0000 (15:16 -0400)]
doc: Grammar fixes for stream selection

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agodoc: Consistently use 'filtergraph'
Derek Buitenhuis [Sat, 30 Mar 2013 19:13:08 +0000 (15:13 -0400)]
doc: Consistently use 'filtergraph'

We used to use 'filtergraph' or 'filter graph' randomly.

'filtergraph' was chosen due to having 57 occurrences in
the documentation, whereas 'filter graph' had only 19.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agodoc: Grammar fixes for FFmpeg's detailed description
Derek Buitenhuis [Sat, 30 Mar 2013 19:08:51 +0000 (15:08 -0400)]
doc: Grammar fixes for FFmpeg's detailed description

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agodoc: Consistently use 'frame rate' everywhere
Derek Buitenhuis [Sat, 30 Mar 2013 18:55:47 +0000 (14:55 -0400)]
doc: Consistently use 'frame rate' everywhere

We used to use 'framerate' or 'frame rate' randomly.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agodoc: Grammar fixes for FFmpeg description
Derek Buitenhuis [Sat, 30 Mar 2013 18:51:05 +0000 (14:51 -0400)]
doc: Grammar fixes for FFmpeg description

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agodoc: Fix grammar in -n description
Derek Buitenhuis [Sat, 30 Mar 2013 18:45:33 +0000 (14:45 -0400)]
doc: Fix grammar in -n description

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agodoc: Small grammar fix in -f description
Derek Buitenhuis [Sat, 30 Mar 2013 18:44:33 +0000 (14:44 -0400)]
doc: Small grammar fix in -f description

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agodoc: Document which cpuflags exist
Derek Buitenhuis [Sat, 30 Mar 2013 18:41:45 +0000 (14:41 -0400)]
doc: Document which cpuflags exist

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agodoc: Explain the various logevel settings
Derek Buitenhuis [Sat, 30 Mar 2013 18:29:33 +0000 (14:29 -0400)]
doc: Explain the various logevel settings

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agodoc: Remove list of format fields
Derek Buitenhuis [Sat, 30 Mar 2013 18:08:28 +0000 (14:08 -0400)]
doc: Remove list of format fields

These are available in the output of -formats.

Similarily, we do not list the fields for e.g. -codecs.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agodoxygen: dont strip code comments
Michael Niedermayer [Sun, 31 Mar 2013 20:34:13 +0000 (22:34 +0200)]
doxygen: dont strip code comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodvdec: fix lowres=3 with yuv 4:1:1
Michael Niedermayer [Sun, 31 Mar 2013 18:37:11 +0000 (20:37 +0200)]
dvdec: fix lowres=3 with yuv 4:1:1

Fixes Ticket2390

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoopt: attempt to improve options dump output.
Clément Bœsch [Sun, 31 Mar 2013 13:14:08 +0000 (15:14 +0200)]
opt: attempt to improve options dump output.

Add some indent and remove the '-' prefix for filters.

6 years agocmdutils: support filters in the help topic system.
Clément Bœsch [Sun, 31 Mar 2013 13:04:04 +0000 (15:04 +0200)]
cmdutils: support filters in the help topic system.

6 years agocmdutils: avtool -> fftool
Clément Bœsch [Sun, 31 Mar 2013 12:49:14 +0000 (14:49 +0200)]
cmdutils: avtool -> fftool

6 years agocmdutils: allow forcing log line repeation
Michael Niedermayer [Sun, 31 Mar 2013 12:08:03 +0000 (14:08 +0200)]
cmdutils: allow forcing log line repeation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils_common_opts: fix loglevel help text as its inaccurate
Michael Niedermayer [Sun, 31 Mar 2013 11:39:48 +0000 (13:39 +0200)]
cmdutils_common_opts: fix loglevel help text as its inaccurate

ffmpeg and ffplay use the loglevel as well as libpostproc, libswscale
and libswresample.

Also this makes the text shorter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexamples/resampling_audio: make use of av_samples_alloc_array_and_samples()
Stefano Sabatini [Thu, 21 Mar 2013 10:55:54 +0000 (11:55 +0100)]
examples/resampling_audio: make use of av_samples_alloc_array_and_samples()

Simplify.

6 years agolavu/samplefmt: add av_samples_alloc_array_and_pointers()
Stefano Sabatini [Thu, 21 Mar 2013 10:48:28 +0000 (11:48 +0100)]
lavu/samplefmt: add av_samples_alloc_array_and_pointers()

6 years agolavfi/overlay: fix debug PTS output in try_filter_frame()
Stefano Sabatini [Sun, 31 Mar 2013 07:51:59 +0000 (09:51 +0200)]
lavfi/overlay: fix debug PTS output in try_filter_frame()

The PTS of the input frames must be interpreted according to the input
timebase, which is not the same as the output timebase.

6 years agooma: Validate sample rates
Luca Barbato [Sat, 30 Mar 2013 08:46:06 +0000 (09:46 +0100)]
oma: Validate sample rates

The sample rate index is 3 bits even if currently index 5, 6 and 7 are
not supported.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agodoc/filters: fix width/height typo in crop filter.
Timothy Gu [Sun, 31 Mar 2013 10:20:17 +0000 (12:20 +0200)]
doc/filters: fix width/height typo in crop filter.

Signed-off-by: Clément Bœsch <ubitux@gmail.com>
6 years agolavfi/volume: use designated initializers for the sample_fmts declaration.
Clément Bœsch [Fri, 29 Mar 2013 11:34:15 +0000 (12:34 +0100)]
lavfi/volume: use designated initializers for the sample_fmts declaration.

6 years agolavfi/volume: use copy props helper instead of incomplete manual code.
Clément Bœsch [Fri, 29 Mar 2013 11:11:24 +0000 (12:11 +0100)]
lavfi/volume: use copy props helper instead of incomplete manual code.

6 years agofate/filter: use aperms to test volume filter.
Clément Bœsch [Fri, 29 Mar 2013 11:10:08 +0000 (12:10 +0100)]
fate/filter: use aperms to test volume filter.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 31 Mar 2013 09:31:19 +0000 (11:31 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/platform: Remove part about dllimport
  vp8: Fix pthread_cond and pthread_mutex leaks

Conflicts:
doc/platform.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodecimate: check for avctx ptr before closing.
Clément Bœsch [Sun, 31 Mar 2013 08:00:32 +0000 (10:00 +0200)]
decimate: check for avctx ptr before closing.

Fixes a crash init failed before setting avctx.

6 years agoUse PIX_FMT_BGR24 for the AviSynth demuxer, instead of RGB24.
Stephen Hutchinson [Sat, 30 Mar 2013 21:34:45 +0000 (17:34 -0400)]
Use PIX_FMT_BGR24 for the AviSynth demuxer, instead of RGB24.

Partial fix for ticket #2412 in that using PIX_FMT_BGR24 fixes the
swapped channels issue when using scripts serving RGB24.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_refs: check for multiple mismatching long term ref assignments
Michael Niedermayer [Sat, 30 Mar 2013 23:18:23 +0000 (00:18 +0100)]
h264_refs: check for multiple mismatching long term ref assignments

Fixes failure of the assert added a few hours ago.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 30 Mar 2013 21:24:55 +0000 (22:24 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: always queue attachment pictures after flushing the video packet queue
  ffplay: fix early frame dropped pts serial

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_direct: assert the validity of the spatial ref
Michael Niedermayer [Sat, 30 Mar 2013 19:57:40 +0000 (20:57 +0100)]
h264_direct: assert the validity of the spatial ref

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: move last_slice_type reset into decode_slice_header
Michael Niedermayer [Sat, 30 Mar 2013 19:51:07 +0000 (20:51 +0100)]
h264: move last_slice_type reset into decode_slice_header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: move the default_ref_list_done check down after its inputs have been written
Michael Niedermayer [Sat, 30 Mar 2013 18:10:04 +0000 (19:10 +0100)]
h264: move the default_ref_list_done check down after its inputs have been written

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_refs: assert that the references are not deallocated
Michael Niedermayer [Sat, 30 Mar 2013 17:39:09 +0000 (18:39 +0100)]
h264_refs: assert that the references are not deallocated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_refs: assert that long ref fields have not been inserted multiple times
Michael Niedermayer [Sat, 30 Mar 2013 16:21:42 +0000 (17:21 +0100)]
h264_refs: assert that long ref fields have not been inserted multiple times

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil: add av_buffer_get_ref_count()
Michael Niedermayer [Sat, 30 Mar 2013 18:13:26 +0000 (19:13 +0100)]
avutil: add av_buffer_get_ref_count()

This function is quite usefull for debuging

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: Move slice_table clean out of frame_start
Michael Niedermayer [Sat, 30 Mar 2013 15:04:07 +0000 (16:04 +0100)]
h264: Move slice_table clean out of frame_start

Fixes inconsistency ultimately leading to an out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/platform: Remove part about dllimport
Derek Buitenhuis [Sat, 30 Mar 2013 17:52:02 +0000 (13:52 -0400)]
doc/platform: Remove part about dllimport

Only deprecated things need this at all anymore, as we have functions
to access them or they are no longer needed.

The document should not encourage use of deprecated APIs.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoffplay: always queue attachment pictures after flushing the video packet queue
Marton Balint [Thu, 28 Mar 2013 00:58:14 +0000 (01:58 +0100)]
ffplay: always queue attachment pictures after flushing the video packet queue

Requeue them after seeking and also after opening a video stream. Also don't
fill the video queue in case of an attached picture video stream since there
will be no more than one packet from that stream.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: fix early frame dropped pts serial
Marton Balint [Sun, 24 Mar 2013 03:14:59 +0000 (04:14 +0100)]
ffplay: fix early frame dropped pts serial

Fixes early frame drop which was kind of broken since
26c208cf0ff59efd7786528884a64d35fc42e9bf.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agovp8: Fix pthread_cond and pthread_mutex leaks
Matt Wolenetz [Thu, 28 Mar 2013 00:29:57 +0000 (17:29 -0700)]
vp8: Fix pthread_cond and pthread_mutex leaks

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoWrite broken aac frames to mov files instead of skipping them.
Carl Eugen Hoyos [Sat, 30 Mar 2013 07:41:46 +0000 (08:41 +0100)]
Write broken aac frames to mov files instead of skipping them.

Fixes decoding with picky media players.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 30 Mar 2013 12:41:39 +0000 (13:41 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix compilation with --enable-decoder=webp --disable-decoder=vp8
  Do not show "Estimating duration from bitrate" warning if no duration was estimated.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: use av_guess_frame_rate()
Michael Niedermayer [Fri, 29 Mar 2013 17:34:19 +0000 (18:34 +0100)]
ffplay: use av_guess_frame_rate()

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: Print correct error message for reference generation too
Michael Niedermayer [Sat, 30 Mar 2013 10:41:58 +0000 (11:41 +0100)]
fate: Print correct error message for reference generation too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 30 Mar 2013 10:21:15 +0000 (11:21 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add an option to generate the references

Conflicts:
doc/fate.texi
tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix compilation with --enable-decoder=webp --disable-decoder=vp8
Carl Eugen Hoyos [Sat, 30 Mar 2013 07:25:44 +0000 (08:25 +0100)]
Fix compilation with --enable-decoder=webp --disable-decoder=vp8

6 years agoDo not show "Estimating duration from bitrate" warning if no duration was estimated.
Carl Eugen Hoyos [Sat, 30 Mar 2013 07:24:51 +0000 (08:24 +0100)]
Do not show "Estimating duration from bitrate" warning if no duration was estimated.

6 years agolavc: remove empty function
Paul B Mahol [Sat, 30 Mar 2013 03:02:41 +0000 (03:02 +0000)]
lavc: remove empty function

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodoc/texi2pod.pl: skip printing chapter names if they are disabled
Stefano Sabatini [Tue, 19 Mar 2013 19:34:42 +0000 (20:34 +0100)]
doc/texi2pod.pl: skip printing chapter names if they are disabled

6 years agolavc/libtheoraenc: clarify comment about global_quality to quality conversion
Stefano Sabatini [Tue, 19 Mar 2013 12:19:12 +0000 (13:19 +0100)]
lavc/libtheoraenc: clarify comment about global_quality to quality conversion

6 years agoFix pthread_cond and pthread_mutex leaks in vp8
Matt Wolenetz [Thu, 28 Mar 2013 00:29:57 +0000 (17:29 -0700)]
Fix pthread_cond and pthread_mutex leaks in vp8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopaf_video: make code independent of sizeof(AVFrame)
Paul B Mahol [Fri, 29 Mar 2013 20:14:13 +0000 (20:14 +0000)]
paf_video: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoaacps: correct opdipd code to match spec
Michael Niedermayer [Fri, 29 Mar 2013 19:58:42 +0000 (20:58 +0100)]
aacps: correct opdipd code to match spec

This fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovmdav: use more unchecked bytestream2 variants where it makes sense
Paul B Mahol [Fri, 29 Mar 2013 19:48:45 +0000 (19:48 +0000)]
vmdav: use more unchecked bytestream2 variants where it makes sense

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agonoise_bsf: check if allocation failed
Paul B Mahol [Fri, 29 Mar 2013 19:00:16 +0000 (19:00 +0000)]
noise_bsf: check if allocation failed

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavc: fix typo
Paul B Mahol [Fri, 29 Mar 2013 18:59:56 +0000 (18:59 +0000)]
lavc: fix typo

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agovda_h264_dec: fit the new API
Xidorn Quan [Fri, 29 Mar 2013 15:15:20 +0000 (23:15 +0800)]
vda_h264_dec: fit the new API

It fixes a memory leak in this decoder caused by the API change.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg/avformat: factor av_guess_frame_rate() out
Michael Niedermayer [Wed, 27 Mar 2013 21:08:53 +0000 (22:08 +0100)]
ffmpeg/avformat: factor av_guess_frame_rate() out

This will be used in ffplay

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/buffer: add get_opaque
Xidorn Quan [Fri, 29 Mar 2013 15:15:19 +0000 (23:15 +0800)]
avutil/buffer: add get_opaque

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add an option to generate the references
Luca Barbato [Mon, 18 Mar 2013 22:45:58 +0000 (23:45 +0100)]
fate: add an option to generate the references

Useful to add or update fate tests.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 29 Mar 2013 10:01:43 +0000 (11:01 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  flvdec: read audio sample size and channels metadata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c3d015775388882b8a122afc337ea35108f652be'
Michael Niedermayer [Fri, 29 Mar 2013 09:46:39 +0000 (10:46 +0100)]
Merge commit 'c3d015775388882b8a122afc337ea35108f652be'

* commit 'c3d015775388882b8a122afc337ea35108f652be':
  flvdec: use the correct audio codec id when parsing metadata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoid3v2: allocate large enough buffer
Michael Niedermayer [Fri, 29 Mar 2013 04:00:52 +0000 (05:00 +0100)]
id3v2: allocate large enough buffer

Fixes array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpegdec: check buffer before using it
Michael Niedermayer [Fri, 29 Mar 2013 03:36:49 +0000 (04:36 +0100)]
mjpegdec: check buffer before using it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoyop: Do not keep a copy of parts of the returned packet
Michael Niedermayer [Thu, 28 Mar 2013 22:59:41 +0000 (23:59 +0100)]
yop: Do not keep a copy of parts of the returned packet

Fixes double free
Regression since the new buffer references, thus no FFmpeg
releases should be affected

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo: Make the table reallocation more robust.
Michael Niedermayer [Thu, 28 Mar 2013 22:46:13 +0000 (23:46 +0100)]
mpegvideo: Make the table reallocation more robust.

This fixes out of array writes after resolution changes
No FFmpeg releases are known to be affected by this

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoLICENSE: add libutvideo in the GPL libraries list.
Clément Bœsch [Fri, 29 Mar 2013 01:08:16 +0000 (02:08 +0100)]
LICENSE: add libutvideo in the GPL libraries list.

6 years agogmc: Always use edge emu
Michael Niedermayer [Thu, 28 Mar 2013 21:23:27 +0000 (22:23 +0100)]
gmc: Always use edge emu

The gmc functions access more pixels than there is allocated memory.
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowmv2: drop non emu edge mode
Michael Niedermayer [Thu, 28 Mar 2013 20:56:02 +0000 (21:56 +0100)]
wmv2: drop non emu edge mode

slightly (~ 0.5%) faster, tested with time ./ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowmv2: Use emu edge mode when the edge is too small
Michael Niedermayer [Thu, 28 Mar 2013 20:49:45 +0000 (21:49 +0100)]
wmv2: Use emu edge mode when the edge is too small

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_refs: Check for attempts to assign pictures to short & long.
Michael Niedermayer [Thu, 28 Mar 2013 20:09:01 +0000 (21:09 +0100)]
h264_refs: Check for attempts to assign pictures to short & long.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate/filter: make overlay test bitexact.
Clément Bœsch [Thu, 28 Mar 2013 16:55:02 +0000 (17:55 +0100)]
fate/filter: make overlay test bitexact.

6 years agofate/filter: move gradfun filtergraph to a dedicated script.
Clément Bœsch [Thu, 28 Mar 2013 16:35:43 +0000 (17:35 +0100)]
fate/filter: move gradfun filtergraph to a dedicated script.

6 years agofate/filter: move concat filtergraph to a dedicated script.
Clément Bœsch [Thu, 28 Mar 2013 16:30:46 +0000 (17:30 +0100)]
fate/filter: move concat filtergraph to a dedicated script.

6 years agofate/filter: move some CMD below deps for consistency.
Clément Bœsch [Thu, 28 Mar 2013 16:26:30 +0000 (17:26 +0100)]
fate/filter: move some CMD below deps for consistency.

6 years agofate/filter: remove pointless indirections for gradfun and hqdn3d.
Clément Bœsch [Thu, 28 Mar 2013 16:25:59 +0000 (17:25 +0100)]
fate/filter: remove pointless indirections for gradfun and hqdn3d.

6 years agofate/filter: rename 'ubitux' rules to 'sample'.
Clément Bœsch [Thu, 28 Mar 2013 16:23:18 +0000 (17:23 +0100)]
fate/filter: rename 'ubitux' rules to 'sample'.

6 years agofate/filter: stick delogo test with its deps (cosmetics).
Clément Bœsch [Thu, 28 Mar 2013 16:20:18 +0000 (17:20 +0100)]
fate/filter: stick delogo test with its deps (cosmetics).

6 years agoavidec: Fix demuxing of non seekable avis with multiple RIFFs
Michael Niedermayer [Thu, 28 Mar 2013 16:22:35 +0000 (17:22 +0100)]
avidec: Fix demuxing of non seekable avis with multiple RIFFs

This solution uses the size of the first RIFF if its valid
to check frame size validity when the filesize could not be determined.
Feedback is welcome, other ideas and improvments as well!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/v4l2: fix printing of list_formats table
Giorgio Vazzana [Thu, 28 Mar 2013 13:05:53 +0000 (14:05 +0100)]
lavd/v4l2: fix printing of list_formats table

In particular we needed a '\n' at the end of the line when the format is emulated.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/v4l2: replace ioctl() with v4l2_ioctl()
Giorgio Vazzana [Thu, 28 Mar 2013 12:03:02 +0000 (13:03 +0100)]
lavd/v4l2: replace ioctl() with v4l2_ioctl()

This is consistent with the rest of the file and makes listing of
emulated formats possible when ffmpeg is compiled with libv4l2.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: Disable af_join test, as its output is not deterministic currently
Michael Niedermayer [Thu, 28 Mar 2013 14:29:21 +0000 (15:29 +0100)]
fate: Disable af_join test, as its output is not deterministic currently

The reason for the failure is unknown, this needs to be debuged and fixed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaf_join: fix channel count and format
Michael Niedermayer [Thu, 28 Mar 2013 14:12:47 +0000 (15:12 +0100)]
af_join: fix channel count and format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 28 Mar 2013 14:02:49 +0000 (15:02 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vmdav: convert to bytestream2
  FATE: add a test for the join filter
  FATE: add a test for the volume filter

Conflicts:
libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaf_channelsplit: set output channels, fix assertion failure
Michael Niedermayer [Thu, 28 Mar 2013 13:22:05 +0000 (14:22 +0100)]
af_channelsplit: set output channels, fix assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '43a8333a16c796b3d855fb3aaa742103cb62731f'
Michael Niedermayer [Thu, 28 Mar 2013 13:10:20 +0000 (14:10 +0100)]
Merge commit '43a8333a16c796b3d855fb3aaa742103cb62731f'

* commit '43a8333a16c796b3d855fb3aaa742103cb62731f':
  FATE: add a test for the channelsplit filter
  FATE: add a test for the channelmap filter
  FATE: add a test for the negate filter
  FATE: add a test for the overlay filter

Conflicts:
tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a'
Michael Niedermayer [Thu, 28 Mar 2013 13:00:15 +0000 (14:00 +0100)]
Merge commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a'

* commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a':
  FATE: add a test for the setpts filter
  FATE: add a test for the hqdn3d filter
  FATE: add a test for the transpose filter
  FATE: add a test for the unsharp filter

Conflicts:
tests/ref/fate/filter-hqdn3d

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497'
Michael Niedermayer [Thu, 28 Mar 2013 12:23:12 +0000 (13:23 +0100)]
Merge commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497'

* commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497':
  FATE: add a test for the fade filter
  FATE: add a test for the drawbox filter
  FATE: add a test for the boxblur filter
  FATE: add a test for the gradfun filter

Conflicts:
tests/fate/filter.mak
tests/ref/fate/filter-gradfun

our gradfun test is renamed to gradfun-ubitux as its name conflicts and
it was requested to be kept. Feel free to rename, change, finetune ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'
Michael Niedermayer [Thu, 28 Mar 2013 12:00:39 +0000 (13:00 +0100)]
Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'

* commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c':
  lavfi/gradfun: remove rounding to match C and SSE code.
  lavfi/gradfun: fix dithering in MMX code.
  lavfi/gradfun: fix rounding in MMX code.
  lavfi/gradfun: do not increment DC pointer for odd values.
  fate: filter: Add dependencies
  avconv: add options for reading filtergraphs from a file.

Conflicts:
Changelog
doc/ffmpeg.texi
doc/filters.texi
ffmpeg.h
ffmpeg_opt.c
libavfilter/vf_gradfun.c
tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/biquads: fix min allowed option value
Paul B Mahol [Thu, 28 Mar 2013 11:52:11 +0000 (11:52 +0000)]
lavfi/biquads: fix min allowed option value

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107'
Michael Niedermayer [Thu, 28 Mar 2013 11:26:36 +0000 (12:26 +0100)]
Merge commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107'

* commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107':
  AVOptions: make av_set_options_string() forward options to child objects
  win32: Use 64-bit fstat/lseek variants for MSVC as well
  win32: Make ff_win32_open more robust

Conflicts:
libavformat/os_support.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a'
Michael Niedermayer [Thu, 28 Mar 2013 11:20:41 +0000 (12:20 +0100)]
Merge commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a'

* commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a':
  win32: Allow other programs to open the same files
  configure: Add error_resilience as dependency to the eatqi decoder

Conflicts:
configure
libavformat/os_support.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'
Michael Niedermayer [Thu, 28 Mar 2013 11:12:31 +0000 (12:12 +0100)]
Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

* commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975':
  ape: use correct context for the bit table printed in debug
  build: Move setting of SRC_DIR to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3'
Michael Niedermayer [Thu, 28 Mar 2013 11:04:53 +0000 (12:04 +0100)]
Merge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3'

* commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3':
  build: Remove configure-generated .config file on distclean
  msmpeg4: Split decoding related functions to a separate file

Conflicts:
Makefile
libavcodec/Makefile
libavcodec/msmpeg4.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f'
Michael Niedermayer [Thu, 28 Mar 2013 10:56:05 +0000 (11:56 +0100)]
Merge commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f'

* commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f':
  mpeg12: Move Mpeg1Context declaration to the only place it is used

Conflicts:
libavcodec/mpeg12.h
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1b6d66745ac1768adb387c2227cdcf4452271149'
Michael Niedermayer [Thu, 28 Mar 2013 10:45:04 +0000 (11:45 +0100)]
Merge commit '1b6d66745ac1768adb387c2227cdcf4452271149'

* commit '1b6d66745ac1768adb387c2227cdcf4452271149':
  Split MPEG-1/2 decoder code off from MPEG-1/2 common code

Conflicts:
libavcodec/Makefile
libavcodec/mpeg12.c

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