1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Commit Graph

985 Commits

Author SHA1 Message Date
Stefano Sabatini
f7ead94c69 Factorize definition of the output_filter defined in both ffplay.c and
ffmpeg.c.
Replace it with a more generic definition which can be shared.

Originally committed as revision 25453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-12 18:40:26 +00:00
Stefano Sabatini
94498ec98a Extend buffer source to accept the time base for the output PTS.
Originally committed as revision 25451 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-12 18:40:20 +00:00
Alexander Strange
0ff4f0c0fc ffmpeg: Use guess_correct_pts() to set decoded picture timestamps
Originally committed as revision 25431 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-10 02:17:26 +00:00
Aurelien Jacobs
fd0368e7ca move av_find_stream_info() info struct to AVStream to avoid messy (re)allocation
Originally committed as revision 25418 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 22:01:19 +00:00
Aurelien Jacobs
ca8064d2d1 fix bitstream filter option mapping when using -newvideo and friends
There was an off-by-one when addressing bitstream_filters[] in this situation.

Originally committed as revision 25398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 19:25:48 +00:00
Michael Niedermayer
2dec2bb880 Pass RC parameters on stream copy to the muxer.
Originally committed as revision 25384 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 01:57:35 +00:00
Aurelien Jacobs
1136850dd5 cosmetic: break long line
Originally committed as revision 25377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-06 18:54:10 +00:00
Aurelien Jacobs
6d3421498e ffmpeg: Fix prototype of some OPT_FUNC2 functions. They must return an int.
Originally committed as revision 25358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-05 21:05:07 +00:00
Aurelien Jacobs
59ac1da26d cosmetic: break long line
Originally committed as revision 25329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-03 20:23:16 +00:00
Reimar Döffinger
a5c33faacc Add init and uninit functions to cmdutils, reduces code duplication
between ffmpeg and ffplay and avoids a valgrind error by freeing
avformat_opts->key.

Originally committed as revision 25309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-02 08:44:33 +00:00
Aurelien Jacobs
84fd51e5ad ffmpeg: replace MAX_STREAMS by an arbitrary sanity check
Originally committed as revision 25304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-01 21:56:09 +00:00
Aurelien Jacobs
620a67d56a ffmpeg: dynamically allocate bitstream_filters
Originally committed as revision 25303 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-01 21:54:20 +00:00
Aurelien Jacobs
3a8e882419 ffmpeg: dynamically allocate stream_maps
Originally committed as revision 25302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-01 21:52:09 +00:00
Aurelien Jacobs
0a6d97b371 ffmpeg: dynamically allocate output_codecs
Originally committed as revision 25301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-01 21:51:12 +00:00
Aurelien Jacobs
311e223f28 ffmpeg: dynamically allocate input_codecs
Originally committed as revision 25300 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-01 21:41:27 +00:00
Aurelien Jacobs
2c6958aabd ffmpeg: dynamically allocate input_files_ts_scale
Originally committed as revision 25299 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-01 21:36:13 +00:00
Aurelien Jacobs
e640f26177 ffmpeg: dynamically allocate streamid_map
Originally committed as revision 25298 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-01 21:34:59 +00:00
Aurelien Jacobs
dba249abee ffmpeg: add a grow_array() helper function
Originally committed as revision 25297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-01 21:29:37 +00:00
Måns Rullgård
b64b4134d5 Rename libavutil/assert.h to avassert.h
This avoids conflicts with the system assert.h.

Originally committed as revision 25284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-01 13:55:13 +00:00
Michael Niedermayer
b926b6282d av_assert() system.
With this the developer can now choose if he wants an assert always enabled or at which
compile time assert level. This can thus replace the #define NDEBUG hacks

Originally committed as revision 25278 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-30 21:57:31 +00:00
Michael Niedermayer
0093ebc20a User application side of Codec specific parameters.
Originally committed as revision 25266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 23:06:51 +00:00
Janne Grunau
d04247a134 use strict_std_complience from avcodec_opts[AVMEDIA_TYPE_*]
Options are not yet set for video encoders and for codec specific
defaults it is desireable to set the codec options only after the codec
is known.

Originally committed as revision 25230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-27 19:59:36 +00:00
Stefano Sabatini
2bc05d3547 Change the syntax of the crop filter from x:y:w:h to w:h:x:y.
Slightly more intuitive and required by a pending changes for making
the filter parametric.

Originally committed as revision 25184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-24 23:14:01 +00:00
Michael Niedermayer
3f07e8dbee Doxy consistency cosmetics
Originally committed as revision 25176 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-24 15:40:53 +00:00
Michael Niedermayer
6b6bca6443 Enable AV_LOG_SKIP_REPEATED to maintain previous behavior.
Originally committed as revision 25175 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-24 15:39:10 +00:00
Stefano Sabatini
e44c01563f Deprecate av_opt_show() in favor of a new function av_opt_show2(),
which allows to specify only a subset of all the options to show.

Originally committed as revision 25166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-24 00:51:40 +00:00
Stefano Sabatini
1790d3b330 Move log_callback_help to cmdutils.[hc], for allowing sharing.
Originally committed as revision 25149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-20 21:48:03 +00:00
Justin Ruggles
ff19d16b91 10l: error in last commit. use decoder channels not encoder channels.
Originally committed as revision 25144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-18 20:19:18 +00:00
Justin Ruggles
37f5a713de Change remaining ost->st->codec and ist->st->codec to enc and dec in
do_audio_out().

Originally committed as revision 25143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-18 20:16:56 +00:00
Martin Storsjö
2dfa7c72ce Update the audio sample rate when doing lowres audio decoding, before opening the decoder
Originally committed as revision 25090 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-09 20:58:13 +00:00
Stefano Sabatini
37b9706123 Factorize opt_new_{audio,video,subtitle} definitions.
Originally committed as revision 24905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-24 15:48:20 +00:00
Stefano Sabatini
dfd5775735 Cosmetics: rename out_video_filter to output_video_filter, for
consistency with input_video_filter.

Originally committed as revision 24904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-24 15:48:17 +00:00
Stefano Sabatini
4ddf0d2915 Make configure_filters() return a meaningful error code rather than
always -1.

Originally committed as revision 24903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-24 15:48:11 +00:00
Ramiro Polla
3f1710e74f indent
Originally committed as revision 24894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-24 00:46:32 +00:00
Vitor Sessak
c4ab519e00 Make "-fs ss" mean "make output file of size equals or less than ss"
instead of current "make output file of size less than ss".

Also use it to make MP3 tests more readable (using -fs xxx where xxx is
the requested output size, not something slightly lower).

Originally committed as revision 24884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 14:46:59 +00:00
Stefano Sabatini
84c0386960 Change avfilter_open() signature, from:
AVFilterContext *avfilter_open(AVFilter *filter, const char *inst_name);
to:
int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name);

This way it is possible to propagate an error code telling the reason
of the failure.

Originally committed as revision 24765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 11:44:51 +00:00
S.N. Hemanth Meenakshisundaram
cc80caff52 Separate video specific BufferRef properties into VideoProps.
Define a new struct AVFilterBufferRefVideoProps and add a type field
to AVFilterBufferRef.

Video specific properties in AVFilterBufferRefVideoProps are now
referred to by *video pointer in AVFilterBufferRef.

Patch by S.N. Hemanth Meenakshisundaram smeenaks->ucsd.edu.

Originally committed as revision 24763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 11:06:04 +00:00
S.N. Hemanth Meenakshisundaram
5d4890d73d Rename fields:
AVFilterLink.srcpic    ->  AVFilterLink.src_buf
AVFilterLink.cur_pic   ->  AVFilterLink.cur_buf
AVFilterLink.outpic    ->  AVFilterLink.out_buf

The new names are more generic and more consistent, since the struct
they contain, which was named AVFilterPicRef, has been renamed to
AVFilterBufferRef.

Patch by S.N. Hemanth Meenakshisundaram %smeenaks%ucsd%edu%.

Originally committed as revision 24732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 01:15:34 +00:00
S.N. Hemanth Meenakshisundaram
7fce481a69 Rename functions and fields:
avfilter_(un)ref_pic       -> avfilter_(un)ref_buffer
avfilter_copy_picref_props -> avfilter_copy_buffer_ref_props
AVFilterBufferRef.pic      -> AVFilterBufferRef.buffer

They have been renamed to allow sharing with audio.

Patch by S.N. Hemanth Meenakshisundaram $smeenaks$ucsd$edu$.

Originally committed as revision 24731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 01:15:27 +00:00
S.N. Hemanth Meenakshisundaram
ecc8dada37 Rename AVFilterPicRef to AVFilterBufferRef.
The struct is going to be used for storing audio buffer references as
well, and the new name is more generic.

Patch by S.N. Hemanth Meenakshisundaram @smeenaks@ucsd@edu@.

Originally committed as revision 24730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 01:15:19 +00:00
Stefano Sabatini
126b638ea0 Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
in favor of the newly added corresponding functions
av_parse_video_size() and av_parse_video_rate() defined in
libavcore/parseutils.h.

This change also adds a linking-time dependency of libavcodec and of
libavfilter on libavcore.

Originally committed as revision 24518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 23:12:28 +00:00
Stefano Sabatini
065a20cb07 Reindent.
Originally committed as revision 24506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 13:39:49 +00:00
Stefano Sabatini
3aace1bcac Rename av_transcode() to transcode().
av_ prefix is reserved for libav* libraries functions, it is confusing
to use it for an application function.

Originally committed as revision 24505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 13:39:41 +00:00
Stefano Sabatini
639e4ec81b Rename av_exit() to ffmpeg_exit().
av_ is a prefix reserved for av* libraries functions, using that for an
application function is confusing.

Originally committed as revision 24497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-25 14:42:32 +00:00
Stefano Sabatini
f62c025a5e Use X ? Y : Z construct, simplify.
Originally committed as revision 24496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-25 14:41:06 +00:00
Stefano Sabatini
f7bd4a8ebd Cosmetics: rename enc -> dec in opt_input_file().
The variable refer to a *decoder* context, the old name was
misleading.

Originally committed as revision 24492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-25 10:42:00 +00:00
Jai Menon
d62ccec8b1 FFmpeg : Replace some av_exit calls in av_transcode with branches to the
cleanup code.

This plugs a bunch of memleaks.

Originally committed as revision 24305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 18:20:41 +00:00
Jai Menon
961e4a3389 FFmpeg : Close input file and free any related memory if
av_find_stream_info fails.

Originally committed as revision 24247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-15 11:53:34 +00:00
Michael Niedermayer
748db0fcc4 Move frame_available computation to where it belongs in ffmpeg.c.
This fixes a infinite loop.
Fixes issue 2066.

Originally committed as revision 24058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-05 14:49:48 +00:00
Stefano Sabatini
9f434b6584 Make opt_pad() print more information.
Originally committed as revision 24050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-04 20:59:02 +00:00