]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sun, 20 May 2012 20:41:58 +0000 (22:41 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo: Make ivi_calc_band_checksum() static, it is only used in one file.
indeo: Drop unused debug function ivi_check_band().
avcodec/utils: cast a function argument to shut up a compiler warning
truemotion1: remove disabled code
fix typo in comment
fate: fix dependencies for non-SAMPLES avconv tests
indeo: check for invalid motion vectors
indeo: check that band output buffer exists
indeo: clear allocated band buffers
indeo: track tile macroblock size
indeo: check custom Huffman tables for errors
factor out common decoding code for Indeo 4 and Indeo 5
mp3: fix start band index for block type 2 in 8kHz audio
lavf: change some (de)muxer names to lowercase
lavf: make output format matching case insensitive
Conflicts:
libavcodec/indeo4.c
libavcodec/indeo5.c
libavcodec/ivi_common.c
libavcodec/utils.c
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Matthieu Bouron [Fri, 4 May 2012 13:40:34 +0000 (15:40 +0200)]
ffmpeg: fix a crash with complex filters when pix_fmt is not specified
ffmpeg -i in.mxf -filter_complex "[0:0]fieldorder=tff" out.wav will
fail with an error message instead of crashing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 May 2012 12:12:48 +0000 (14:12 +0200)]
ffmpeg: drop get_sync_ipts() and drop related special case for video
Idea found in a commit from Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sun, 20 May 2012 13:53:02 +0000 (15:53 +0200)]
lavf: also use codec aspect ratio in av_guess_sample_aspect_ratio
Use codec aspect ratio for frame aspect ratio if AVFrame is NULL.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 20 May 2012 12:41:14 +0000 (14:41 +0200)]
vsrc_mandelbrot: use AV_OPT_TYPE_IMAGE_SIZE.
Nicolas George [Sun, 20 May 2012 12:39:35 +0000 (14:39 +0200)]
vsrc_life: use AV_OPT_TYPE_IMAGE_SIZE.
Nicolas George [Sun, 20 May 2012 12:37:19 +0000 (14:37 +0200)]
vsrc_cellauto: use AV_OPT_TYPE_IMAGE_SIZE.
Nicolas George [Sun, 20 May 2012 12:32:03 +0000 (14:32 +0200)]
vf_ass: use AV_OPT_TYPE_IMAGE_SIZE.
Nicolas George [Sun, 20 May 2012 12:18:15 +0000 (14:18 +0200)]
x11grab: use AV_OPT_TYPE_IMAGE_SIZE.
Nicolas George [Sun, 20 May 2012 12:11:03 +0000 (14:11 +0200)]
v4l2: use AV_OPT_TYPE_IMAGE_SIZE.
Nicolas George [Sun, 20 May 2012 12:09:10 +0000 (14:09 +0200)]
sdl: use AV_OPT_TYPE_IMAGE_SIZE.
Nicolas George [Sun, 20 May 2012 11:57:03 +0000 (13:57 +0200)]
bktr: use AV_OPT_TYPE_IMAGE_SIZE.
Nicolas George [Sun, 20 May 2012 11:53:50 +0000 (13:53 +0200)]
vsrc_testsrc: use AV_OPT_TYPE_IMAGE_SIZE.
Nicolas George [Sun, 20 May 2012 11:53:19 +0000 (13:53 +0200)]
opt: add AV_OPT_TYPE_IMAGE_SIZE.
Jean First [Tue, 15 May 2012 14:34:58 +0000 (16:34 +0200)]
exr: fix header parsing
the header in the sample provided for ticket #1306 is not parsed correctly and thus
ffmpeg tries to decode the sample instead of abording the decoding.
I tested it with two other exr samples I have - one float, one half float - and
they still decode correctly.
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 May 2012 14:01:54 +0000 (16:01 +0200)]
vf_scale: support dynamically changing input parameters.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 May 2012 14:02:49 +0000 (16:02 +0200)]
ffplay: Use input picture parameters in input_request_frame().
Fixes Ticket122
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Sat, 19 May 2012 18:58:17 +0000 (20:58 +0200)]
id3v2: reject APICs with size of 0
fixes ticket #1324
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Sat, 19 May 2012 00:09:18 +0000 (02:09 +0200)]
flicvideo: support 256-bytes extradata
sample:
http://www.datafilehost.com/download-
ab1156a9 .html
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Sat, 19 May 2012 00:07:45 +0000 (02:07 +0200)]
aasc: support 16bpp
sample:
http://www.datafilehost.com/download-
b881f3f6 .html
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 May 2012 12:11:48 +0000 (14:11 +0200)]
ffmpeg: move setting big_picture.pts up
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 18 Feb 2011 21:49:40 +0000 (22:49 +0100)]
lavu/tree: perform minor fixes to av_tree_insert() documentation
Diego Biurrun [Sun, 20 May 2012 13:59:30 +0000 (15:59 +0200)]
indeo: Make ivi_calc_band_checksum() static, it is only used in one file.
Diego Biurrun [Sat, 19 May 2012 14:41:42 +0000 (16:41 +0200)]
indeo: Drop unused debug function ivi_check_band().
Nicolas George [Sun, 20 May 2012 13:41:58 +0000 (15:41 +0200)]
buffersrc: cosmetic: reindent.
Diego Biurrun [Wed, 11 Apr 2012 13:00:37 +0000 (15:00 +0200)]
avcodec/utils: cast a function argument to shut up a compiler warning
libavcodec/utils.c:251: note: expected ‘const uint8_t *’ but argument is of type ‘const short int *’
Diego Biurrun [Fri, 29 Jul 2011 10:48:45 +0000 (12:48 +0200)]
truemotion1: remove disabled code
Kostya Shishkov [Sun, 20 May 2012 11:55:33 +0000 (13:55 +0200)]
fix typo in comment
Mans Rullgard [Sat, 19 May 2012 21:56:01 +0000 (22:56 +0100)]
fate: fix dependencies for non-SAMPLES avconv tests
The encode/decode tests should all depend on avconv. Since
avconv requires libavfilter, there is no need to enable those
tests selectively.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Nicolas George [Sun, 20 May 2012 10:30:16 +0000 (12:30 +0200)]
cmdutils: allow to specify a stream by its ID.
The stream can be specified as "#129" or "#0x81".
It is especially useful for VOBs dumped from a DVD,
where the language-id mapping is available externally
and the probing can find the streams in a random order.
Michael Niedermayer [Sun, 20 May 2012 10:29:33 +0000 (12:29 +0200)]
ffmpeg: change AVFMT_RAWPICTURE pts to reduce diff to qatar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 May 2012 10:24:49 +0000 (12:24 +0200)]
ffmpeg: random cosmectics to reduce diff to qatar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 May 2012 10:06:56 +0000 (12:06 +0200)]
ffmpeg: cosmetics to reduce difference to qatar by 101 lines
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 May 2012 10:04:09 +0000 (12:04 +0200)]
ffmpeg: cosmetics to reduce difference to qatar by about 90 lines
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 May 2012 09:55:25 +0000 (11:55 +0200)]
ffmpeg: move ost->frame_rate setting code before the filtergraph stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 May 2012 09:27:57 +0000 (11:27 +0200)]
ffmpeg: drop pkt_pts
Reduces diff to qatar by 9 lines
Should not change anything
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 May 2012 08:57:23 +0000 (10:57 +0200)]
ffmpeg: set the video filters timebase to the demuxers.
Inspired-by a change from Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 May 2012 08:28:41 +0000 (10:28 +0200)]
ffmpeg: reintroducing check_recording_time()
This reduces the difference to qatar by 27 lines
No functional change, the code should be unused
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 May 2012 09:30:51 +0000 (11:30 +0200)]
ffmpeg: fix uninitialized variable warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kostya Shishkov [Sat, 19 May 2012 14:07:42 +0000 (16:07 +0200)]
indeo: check for invalid motion vectors
Kostya Shishkov [Sat, 19 May 2012 11:45:00 +0000 (13:45 +0200)]
indeo: check that band output buffer exists
Kostya Shishkov [Sat, 19 May 2012 11:39:15 +0000 (13:39 +0200)]
indeo: clear allocated band buffers
Kostya Shishkov [Sat, 19 May 2012 11:08:51 +0000 (13:08 +0200)]
indeo: track tile macroblock size
Kostya Shishkov [Sat, 19 May 2012 10:39:49 +0000 (12:39 +0200)]
indeo: check custom Huffman tables for errors
Kostya Shishkov [Sat, 19 May 2012 10:23:23 +0000 (12:23 +0200)]
factor out common decoding code for Indeo 4 and Indeo 5
Kostya Shishkov [Wed, 16 May 2012 16:39:40 +0000 (18:39 +0200)]
mp3: fix start band index for block type 2 in 8kHz audio
In hybrid frames long window part ends at 36 samples for most of the cases
but at 72 for 8kHz case. For some reason decoder assumed it's 48 or even 36
samples, which caused wrong bitstream decoding for such blocks.
l3_25207.mpg from conformance suite demonstrates it the best.
Michael Niedermayer [Sat, 19 May 2012 22:25:36 +0000 (00:25 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: fix dependencies on SAMPLES being set
fate: remove unnecessary libavfilter dependency
Conflicts:
ffmpeg.c
tests/Makefile
tests/fate/aac.mak
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/mpc.mak
tests/fate/probe.mak
tests/fate/qt.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/vqf.mak
tests/ref/fate/idroq-video-encode
tests/ref/fate/vc1-ism
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 20:42:32 +0000 (22:42 +0200)]
swr: skip soft compensation when its disabled.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 20:22:45 +0000 (22:22 +0200)]
mpegaudidec: 10l forgot buf_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 20:15:21 +0000 (22:15 +0200)]
mpegaudiodec: skip initial zeros.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sat, 19 May 2012 16:13:17 +0000 (17:13 +0100)]
lavf: change some (de)muxer names to lowercase
This is consistent with other format names.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 19 May 2012 17:44:16 +0000 (18:44 +0100)]
lavf: make output format matching case insensitive
This is consistent with how input formats are matched.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Sat, 19 May 2012 18:31:24 +0000 (20:31 +0200)]
Merge commit '
755cd4197d53946208e042f095b930dca18d9430 '
* commit '
755cd4197d53946208e042f095b930dca18d9430 ':
mov: enable parsing for VC-1.
lavfi: Add fps filter.
lavfi: initialize pts to AV_NOPTS_VALUE when creating new buffer refs.
avconv: add support for audio in complex filtergraphs.
Conflicts:
ffmpeg.c
libavfilter/version.h
libavformat/mov.c
tests/ref/fate/vc1-ism
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 19 May 2012 18:05:21 +0000 (20:05 +0200)]
Use a variable instead of a repeated calculation when decoding AVUI.
Carl Eugen Hoyos [Sat, 19 May 2012 17:28:27 +0000 (19:28 +0200)]
avuidec.c: Fix indentation.
Carl Eugen Hoyos [Sat, 19 May 2012 17:27:14 +0000 (19:27 +0200)]
Simplify AVUI decoding, one skip value is enough.
Carl Eugen Hoyos [Sat, 19 May 2012 17:20:22 +0000 (19:20 +0200)]
Fix interlaced AVUI decoding.
Michael Niedermayer [Sat, 19 May 2012 16:50:10 +0000 (18:50 +0200)]
ffmpeg: inject a aresample filter for -async
Based on similar code from anton
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 16:48:53 +0000 (18:48 +0200)]
af_aresample: use new swr API to pass and compensate PTS
This code is not only much more powerfull its also simpler
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 16:48:05 +0000 (18:48 +0200)]
af_aresample: allocate a larger buffer so accumulated data can be returned quicker
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 16:46:25 +0000 (18:46 +0200)]
af_aresample: use extended_data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 16:44:34 +0000 (18:44 +0200)]
swr: add swr_next_pts()
parameter descriptions partly reuse text from af_asyncts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 16:42:11 +0000 (18:42 +0200)]
swr: add swr_drop_output()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 16:39:12 +0000 (18:39 +0200)]
swr: add swr_inject_silence()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 16:37:12 +0000 (18:37 +0200)]
swr: Fix issue with injecting more data than can be used up in the next call.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 15:47:06 +0000 (17:47 +0200)]
swr: add some asserts to resample()
These check that the internal and input buffers match in format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 15:46:41 +0000 (17:46 +0200)]
swr: add reversefill_audiodata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 15:45:41 +0000 (17:45 +0200)]
swr: fix buf_set() so it works with input == output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 15:45:12 +0000 (17:45 +0200)]
swr: make literal 32 a named constant in realloc_audio()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 15:44:40 +0000 (17:44 +0200)]
swr: fill_audio_data() support NULL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sat, 19 May 2012 16:12:09 +0000 (18:12 +0200)]
f_split: fix output type.
The previous version checked the filter context name,
instead of checking the filter name.
The new version just uses the same type as the input.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Nicolas George [Fri, 18 May 2012 10:43:31 +0000 (12:43 +0200)]
avfilter: make AVFilterFormats compatible with libav.
The list goes back to being simple integers,
and avfilter_make_format64_list is fixed to work
with the correct structure directly.
Mans Rullgard [Sat, 19 May 2012 12:19:19 +0000 (13:19 +0100)]
fate: fix dependencies on SAMPLES being set
This allows fate to run without errors with or without SAMPLES
being set.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Fri, 18 May 2012 16:08:13 +0000 (17:08 +0100)]
fate: remove unnecessary libavfilter dependency
avconv now requires libavfilter so this dependency is redundant.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Stefano Sabatini [Fri, 18 May 2012 17:41:44 +0000 (19:41 +0200)]
lavfi: rename vf_split.c -> f_split.c
The file now contains both an audio and a video split filter.
Stefano Sabatini [Fri, 18 May 2012 17:38:38 +0000 (19:38 +0200)]
lavfi/asplit: move asplit code to vf_split.c, and make it support N outputs
The move allows to share the init code already used by split.
Clément Bœsch [Sat, 12 May 2012 20:39:30 +0000 (22:39 +0200)]
lavf/id3v2: always strdup the value.
This simplifies the code but also fix a warning: ff_id3v1_genre_str
array contains const strings so do the string dup now instead of in
av_dict_set().
Clément Bœsch [Sat, 12 May 2012 20:31:11 +0000 (22:31 +0200)]
lavf/id3v2: do not export empty fields.
This also avoids a memleak.
Clément Bœsch [Fri, 18 May 2012 22:08:26 +0000 (00:08 +0200)]
doc/examples: make use of the parameter filters_descr parameter in init_filters().
Clément Bœsch [Wed, 9 May 2012 21:57:40 +0000 (23:57 +0200)]
doc/examples: install them with the shared data.
Clément Bœsch [Sat, 12 May 2012 21:13:19 +0000 (23:13 +0200)]
doc/examples: fix pts heuristic in filtering_video.
Note: the condition looked wrong in the first place ("if DTS is not
defined, then set PTS to that undefined value [...]").
Clément Bœsch [Sat, 12 May 2012 20:44:59 +0000 (22:44 +0200)]
lavfi/buffersink: typo fix in a comment.
Clément Bœsch [Sat, 12 May 2012 20:33:39 +0000 (22:33 +0200)]
doc/examples: properly close input in metadata.
Avoid some memleaks.
Clément Bœsch [Sat, 12 May 2012 17:56:58 +0000 (19:56 +0200)]
doc/examples: print operation filename in decoding_encoding.
Clément Bœsch [Sat, 12 May 2012 16:06:26 +0000 (18:06 +0200)]
doc/examples: add debug compilation flag.
Clément Bœsch [Sat, 12 May 2012 15:33:16 +0000 (17:33 +0200)]
build: remove non-existant examples rule.
Clément Bœsch [Sat, 12 May 2012 15:26:01 +0000 (17:26 +0200)]
doc/examples: use system headers in decoding_encoding and muxing.
All the other examples already use the system installed headers.
Clément Bœsch [Thu, 10 May 2012 17:09:34 +0000 (19:09 +0200)]
doc/examples: remove explicit rules.
These rules are already in gmake builtins.
Clément Bœsch [Sat, 19 May 2012 10:28:09 +0000 (12:28 +0200)]
doc/examples: add libavr to libraries to avoid link failures.
Clément Bœsch [Sat, 19 May 2012 10:05:02 +0000 (12:05 +0200)]
ffmpeg: misc cosmetics.
Reduce diff against avconv, and change some doxycomments into normal
comments (no point in doxifying ffmpeg internal fields).
Nicolas George [Fri, 18 May 2012 11:59:48 +0000 (13:59 +0200)]
ffmpeg: adapt to the buffersrc API changes.
Nicolas George [Fri, 18 May 2012 11:56:22 +0000 (13:56 +0200)]
lavfi: unify src_buffer and buffersrc.
Most of the code is moved to buffersrc.c
to help Git see the similarities.
src_buffer.c still contains the obsolete compatibility functions.
The format change detection code was removed as it has been
implemented directly in ffmpeg.
It can easily be brought back from the history.
Nicolas George [Fri, 18 May 2012 11:29:43 +0000 (13:29 +0200)]
lavfi: remove stray reference to planar/packed.
Nicolas George [Fri, 18 May 2012 10:44:11 +0000 (12:44 +0200)]
avfilter: move some fields in AVFilterLink.
It restores ABI compatibility with libav.
The fields that move were very recent or morally private.
Michael Niedermayer [Fri, 18 May 2012 22:38:21 +0000 (00:38 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Replace some @file tags by more suitable markup.
fate: Set FUZZ factor of vorbis-13 test to 2.
fate: Set FUZZ factor of (e)ac3-encode test to 3.
fate: remove unused code from regressions-funcs.sh
rtmp: Don't assume path points to a string of nonzero length
avconv: fix behavior with -ss as an output option.
Conflicts:
doc/platform.texi
doc/protocols.texi
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 18 May 2012 22:15:03 +0000 (00:15 +0200)]
ffmpeg: fix warning & bug for keep_pix_fmt
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 18 May 2012 21:40:53 +0000 (23:40 +0200)]
ffmpeg: remove unused variable i.
Clément Bœsch [Thu, 17 May 2012 18:57:22 +0000 (20:57 +0200)]
ffmpeg: do not deprecate -vol and -map_channel.
These helpers are handy, just notice the user it is done using lavfi.
Clément Bœsch [Thu, 17 May 2012 17:31:35 +0000 (19:31 +0200)]
ffmpeg: resurrect -map_channel.
Clément Bœsch [Thu, 17 May 2012 17:32:17 +0000 (19:32 +0200)]
pan: use ff_parse_channel_layout() instead of av_get_channel_layout().
This allow specifying hexadecimal channel layout, and also handle the
error printing internally.