generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
40,880 Commits 24 Branches 241 Tags 173 MiB
ef7ac8e8ec
Commit Graph

40880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
ef7ac8e8ec ffmpeg: set the video filters timebase to the demuxers. 
Inspired-by a change from Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 11:40:05 +02:00
Michael Niedermayer
3cf5591344 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>
 2012-05-20 11:35:08 +02:00
Michael Niedermayer
8364cb9719 ffmpeg: fix uninitialized variable warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 11:35:08 +02:00
Michael Niedermayer
31f3c94760 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>
 2012-05-20 10:21:52 +02:00
Michael Niedermayer
d1384c00d4 swr: skip soft compensation when its disabled. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 22:42:32 +02:00
Michael Niedermayer
c5371f775c mpegaudidec: 10l forgot buf_size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 22:22:45 +02:00
Michael Niedermayer
43bc5cf9f4 mpegaudiodec: skip initial zeros. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 22:15:21 +02:00
Michael Niedermayer
040a796dab 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>
 2012-05-19 20:31:24 +02:00
Carl Eugen Hoyos
612abe2773 Use a variable instead of a repeated calculation when decoding AVUI. 2012-05-19 20:07:28 +02:00
Carl Eugen Hoyos
f1892348c2 avuidec.c: Fix indentation. 2012-05-19 20:07:28 +02:00
Carl Eugen Hoyos
d9b2410f75 Simplify AVUI decoding, one skip value is enough. 2012-05-19 20:07:28 +02:00
Carl Eugen Hoyos
2596d7261d Fix interlaced AVUI decoding. 2012-05-19 20:07:28 +02:00
Michael Niedermayer
9d30a96aa1 ffmpeg: inject a aresample filter for -async 
Based on similar code from anton

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:38 +02:00
Michael Niedermayer
21d8a80e30 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>
 2012-05-19 19:23:38 +02:00
Michael Niedermayer
087d09b6d5 af_aresample: allocate a larger buffer so accumulated data can be returned quicker 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:38 +02:00
Michael Niedermayer
e17a039647 af_aresample: use extended_data 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:38 +02:00
Michael Niedermayer
72a242c998 swr: add swr_next_pts() 
parameter descriptions partly reuse text from af_asyncts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
f88f705abc swr: add swr_drop_output() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
7a59964ba9 swr: add swr_inject_silence() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
72872d0201 swr: Fix issue with injecting more data than can be used up in the next call. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
c5c355546d 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>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
75e25f8540 swr: add reversefill_audiodata() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
5027e3daf7 swr: fix buf_set() so it works with input == output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
bdbfd4569d swr: make literal 32 a named constant in realloc_audio() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
186be49fd5 swr: fill_audio_data() support NULL 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Nicolas George
3d2515a8f3 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>
 2012-05-19 19:23:37 +02:00
Nicolas George
5ac9ef6493 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.
 2012-05-19 15:30:51 +02:00
Mans Rullgard
63dcd16d56 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>
 2012-05-19 14:30:41 +01:00
Mans Rullgard
8ccc1c5975 fate: remove unnecessary libavfilter dependency 
avconv now requires libavfilter so this dependency is redundant.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-19 14:25:00 +01:00
Stefano Sabatini
0e82d317eb lavfi: rename vf_split.c -> f_split.c 
The file now contains both an audio and a video split filter.
 2012-05-19 13:24:57 +02:00
Stefano Sabatini
150227e8ed 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.
 2012-05-19 13:24:53 +02:00
Clément Bœsch
e5fcf3646a 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().
 2012-05-19 12:29:30 +02:00
Clément Bœsch
6ad974ae1c lavf/id3v2: do not export empty fields. 
This also avoids a memleak.
 2012-05-19 12:29:30 +02:00
Clément Bœsch
4fd573970a doc/examples: make use of the parameter filters_descr parameter in init_filters(). 2012-05-19 12:29:05 +02:00
Clément Bœsch
0cc9ee5fab doc/examples: install them with the shared data. 2012-05-19 12:28:59 +02:00
Clément Bœsch
e692b9d564 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 [...]").
 2012-05-19 12:28:59 +02:00
Clément Bœsch
60ea6b0996 lavfi/buffersink: typo fix in a comment. 2012-05-19 12:28:59 +02:00
Clément Bœsch
5e82ec9b42 doc/examples: properly close input in metadata. 
Avoid some memleaks.
 2012-05-19 12:28:59 +02:00
Clément Bœsch
50df68fd50 doc/examples: print operation filename in decoding_encoding. 2012-05-19 12:28:59 +02:00
Clément Bœsch
c6bbe3c2a7 doc/examples: add debug compilation flag. 2012-05-19 12:28:59 +02:00
Clément Bœsch
06e4b98382 build: remove non-existant examples rule. 2012-05-19 12:28:59 +02:00
Clément Bœsch
6c211085bb doc/examples: use system headers in decoding_encoding and muxing. 
All the other examples already use the system installed headers.
 2012-05-19 12:28:58 +02:00
Clément Bœsch
136ca0e5f8 doc/examples: remove explicit rules. 
These rules are already in gmake builtins.
 2012-05-19 12:28:58 +02:00
Clément Bœsch
7aedfeebfb doc/examples: add libavr to libraries to avoid link failures. 2012-05-19 12:28:48 +02:00
Clément Bœsch
eb945ab484 ffmpeg: misc cosmetics. 
Reduce diff against avconv, and change some doxycomments into normal
comments (no point in doxifying ffmpeg internal fields).
 2012-05-19 12:05:05 +02:00
Nicolas George
00be2f5726 ffmpeg: adapt to the buffersrc API changes. 2012-05-19 10:59:52 +02:00
Nicolas George
aa1246ea42 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.
 2012-05-19 10:59:52 +02:00
Nicolas George
7997fc49ef lavfi: remove stray reference to planar/packed. 2012-05-19 10:59:52 +02:00
Nicolas George
9567f410aa avfilter: move some fields in AVFilterLink. 
It restores ABI compatibility with libav.

The fields that move were very recent or morally private.
 2012-05-19 10:59:52 +02:00
Michael Niedermayer
31dfe20dd2 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>
 2012-05-19 00:52:25 +02:00