| Branch: | Revision:

ffmpeg / ffmpeg.c @ d370e3e9

History | View | Annotate | Download (155 KB)

# Date Author Comment
da1b9b88 11/02/2010 06:40 PM Stefano Sabatini

Fix timestamp computation when the timebase changes during filtering.

The timestamps for all the buffered frames are scaled against
AV_TIME_BASE_Q, and need to be scaled back to AV_TIME_BASE_Q when they
are extracted from the filterchain.

Originally committed as revision 25646 to svn://

45290fcd 11/02/2010 06:12 AM Anton Khirnov

ffmpeg.c: reindent

Originally committed as revision 25637 to svn://

d0abe80a 11/02/2010 06:12 AM Anton Khirnov

ffmpeg.c: don't autocopy stream/chapter metadata if manual mapping is specified

Originally committed as revision 25636 to svn://

1829e195 11/02/2010 06:01 AM Anton Khirnov

ffmpeg.c: extend map_meta_data to allow advanced mappings

i.e. to/from streams/chapters/programs.

Originally committed as revision 25635 to svn://

0422af7e 11/02/2010 12:29 AM Stefano Sabatini

Remove ffmpeg PGMYUV compatibility hack, which was deprecated since

The user is requested to specify "-f image2" in place of "-f pgmyuv"
for reading/writing PGMYUV files, as for the other image formats.

Originally committed as revision 25629 to svn://

2839dc97 10/31/2010 10:48 PM Stefano Sabatini

Use AV_RL32() in opt_codec_tag().

Originally committed as revision 25618 to svn://

0d0778b0 10/31/2010 07:55 PM Ramiro Polla

ffmpeg: fix opt_codec_tag() return value

opt_codec_tag() is now used under OPT_FUNC2, which must return a value.

Originally committed as revision 25616 to svn://

b67f3d65 10/29/2010 02:54 PM Rocky Cardwell

Fix ffserver-related regression (and crash) introduced in r25500.
Fixes issue 2317.

Patch by Rocky Cardwell, rocky d cardwell a lifespringschool d org

Originally committed as revision 25603 to svn://

ec1ca41c 10/29/2010 02:48 PM Carl Eugen Hoyos

Move new_output_stream() up for upcoming fix for issue 2317.

Originally committed as revision 25602 to svn://

63e856df 10/28/2010 08:28 PM Anton Khirnov

ffmpeg.c: dynamically allocate metadata maps

Originally committed as revision 25599 to svn://

d0242e74 10/28/2010 01:20 PM Stefano Sabatini

Factorize: opt_{audio,video,subtitle}_tag() -> opt_codec_tag().

Originally committed as revision 25596 to svn://

96ea6ad2 10/20/2010 09:45 AM Stefano Sabatini

Remove unused variables picture_crop_temp and picture_pad_temp.

Originally committed as revision 25530 to svn://

4ad08021 10/18/2010 09:47 PM Nicolas George

Add a -force_key_frames option to ffmpeg.

The option is useful to ensure that there is a seek point exactly at a
place the user will probably want to jump precisely sometime, the
major example would be the end of an opening and the beginning of a
chapter. The scene change detection system will often make it happen,...

ff0652e5 10/18/2010 01:57 PM Stefano Sabatini

Implement a common get_filtered_video_frame(), shared between ffplay.c
and ffmpeg.c.

Originally committed as revision 25520 to svn://

16b26913 10/18/2010 01:43 PM Stefano Sabatini

Make help message for the -crop* options consistent with that of the
-pad* options and more direct.

Originally committed as revision 25519 to svn://

5879ea6d 10/18/2010 01:34 PM Stefano Sabatini

Remove -crop* options.

Users are required to use the libavfilter crop filter.

Originally committed as revision 25518 to svn://

3f2a7e42 10/16/2010 08:57 PM Stefano Sabatini

Cosmetics: use a more compact notation, improve readability and reduce
line count.

Originally committed as revision 25510 to svn://

dbabc277 10/16/2010 04:16 PM Stefano Sabatini

Reset metadata after opt_output_file(), fix the previous commit.

Spotted by elenril on irc.

Originally committed as revision 25509 to svn://

4bf65e2a 10/16/2010 03:25 PM Stefano Sabatini

Use an AVMetadata struct for storing metadata, simplify.

Originally committed as revision 25508 to svn://

a7e5a832 10/16/2010 01:04 PM Anton Khirnov

ffmpeg.c/ffprobe.c: remove all uses of av_metadata_conv()
patch by Anton Khirnov anton at khirnov dot net

Originally committed as revision 25503 to svn://

2a24df93 10/16/2010 10:20 AM Stefano Sabatini

Add avfilter_graph_config().

Originally committed as revision 25502 to svn://

0b6d358a 10/16/2010 10:06 AM Nicolas George

Place the bitstream_filters variable in the AVOutputStream, thus
greatly simplifying its handling and reducing code duplication.

Patch by Nicolas George -bsf nicolas*george|normalesup+org.

Originally committed as revision 25501 to svn://

9fdf4b58 10/16/2010 10:06 AM Nicolas George

Move the allocation of the AVOutputStream structure earlier in the
code flow, in the new_video_stream() / new_audio_stream() /
new_subtitle_stream() functions.

Patch by Nicolas George <>.

Originally committed as revision 25500 to svn://

f7ead94c 10/12/2010 06:40 PM Stefano Sabatini

Factorize definition of the output_filter defined in both ffplay.c and
Replace it with a more generic definition which can be shared.

Originally committed as revision 25453 to svn://

94498ec9 10/12/2010 06:40 PM Stefano Sabatini

Extend buffer source to accept the time base for the output PTS.

Originally committed as revision 25451 to svn://

0ff4f0c0 10/10/2010 02:17 AM Alexander Strange

ffmpeg: Use guess_correct_pts() to set decoded picture timestamps

Originally committed as revision 25431 to svn://

fd0368e7 10/08/2010 10:01 PM Aurelien Jacobs

move av_find_stream_info() info struct to AVStream to avoid messy (re)allocation

Originally committed as revision 25418 to svn://

ca8064d2 10/07/2010 07:25 PM Aurelien Jacobs

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://

2dec2bb8 10/07/2010 01:57 AM Michael Niedermayer

Pass RC parameters on stream copy to the muxer.

Originally committed as revision 25384 to svn://

1136850d 10/06/2010 06:54 PM Aurelien Jacobs

cosmetic: break long line

Originally committed as revision 25377 to svn://

6d342149 10/05/2010 09:05 PM Aurelien Jacobs

ffmpeg: Fix prototype of some OPT_FUNC2 functions. They must return an int.

Originally committed as revision 25358 to svn://

59ac1da2 10/03/2010 08:23 PM Aurelien Jacobs

cosmetic: break long line

Originally committed as revision 25329 to svn://

a5c33faa 10/02/2010 08:44 AM Reimar Döffinger

Add init and uninit functions to cmdutils, reduces code duplication
between ffmpeg and ffplay and avoids a valgrind error by freeing

Originally committed as revision 25309 to svn://

84fd51e5 10/01/2010 09:56 PM Aurelien Jacobs

ffmpeg: replace MAX_STREAMS by an arbitrary sanity check

Originally committed as revision 25304 to svn://

620a67d5 10/01/2010 09:54 PM Aurelien Jacobs

ffmpeg: dynamically allocate bitstream_filters

Originally committed as revision 25303 to svn://

3a8e8824 10/01/2010 09:52 PM Aurelien Jacobs

ffmpeg: dynamically allocate stream_maps

Originally committed as revision 25302 to svn://

0a6d97b3 10/01/2010 09:51 PM Aurelien Jacobs

ffmpeg: dynamically allocate output_codecs

Originally committed as revision 25301 to svn://

311e223f 10/01/2010 09:41 PM Aurelien Jacobs

ffmpeg: dynamically allocate input_codecs

Originally committed as revision 25300 to svn://

2c6958aa 10/01/2010 09:36 PM Aurelien Jacobs

ffmpeg: dynamically allocate input_files_ts_scale

Originally committed as revision 25299 to svn://

e640f261 10/01/2010 09:34 PM Aurelien Jacobs

ffmpeg: dynamically allocate streamid_map

Originally committed as revision 25298 to svn://

dba249ab 10/01/2010 09:29 PM Aurelien Jacobs

ffmpeg: add a grow_array() helper function

Originally committed as revision 25297 to svn://

b64b4134 10/01/2010 01:55 PM Måns Rullgård

Rename libavutil/assert.h to avassert.h

This avoids conflicts with the system assert.h.

Originally committed as revision 25284 to svn://

b926b628 09/30/2010 09:57 PM Michael Niedermayer

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://

0093ebc2 09/29/2010 11:06 PM Michael Niedermayer

User application side of Codec specific parameters.

Originally committed as revision 25266 to svn://

d04247a1 09/27/2010 07:59 PM Janne Grunau

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://

2bc05d35 09/24/2010 11:14 PM Stefano Sabatini

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://

3f07e8db 09/24/2010 03:40 PM Michael Niedermayer

Doxy consistency cosmetics

Originally committed as revision 25176 to svn://

6b6bca64 09/24/2010 03:39 PM Michael Niedermayer

Enable AV_LOG_SKIP_REPEATED to maintain previous behavior.

Originally committed as revision 25175 to svn://

e44c0156 09/24/2010 12:51 AM Stefano Sabatini

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://

1790d3b3 09/20/2010 09:48 PM Stefano Sabatini

Move log_callback_help to cmdutils.[hc], for allowing sharing.

Originally committed as revision 25149 to svn://

ff19d16b 09/18/2010 08:19 PM Justin Ruggles

10l: error in last commit. use decoder channels not encoder channels.

Originally committed as revision 25144 to svn://

37f5a713 09/18/2010 08:16 PM Justin Ruggles

Change remaining ost->st->codec and ist->st->codec to enc and dec in

Originally committed as revision 25143 to svn://

2dfa7c72 09/09/2010 08:58 PM Martin Storsjö

Update the audio sample rate when doing lowres audio decoding, before opening the decoder

Originally committed as revision 25090 to svn://

37b97061 08/24/2010 03:48 PM Stefano Sabatini

Factorize opt_new_{audio,video,subtitle} definitions.

Originally committed as revision 24905 to svn://

dfd57757 08/24/2010 03:48 PM Stefano Sabatini

Cosmetics: rename out_video_filter to output_video_filter, for
consistency with input_video_filter.

Originally committed as revision 24904 to svn://

4ddf0d29 08/24/2010 03:48 PM Stefano Sabatini

Make configure_filters() return a meaningful error code rather than
always -1.

Originally committed as revision 24903 to svn://

3f1710e7 08/24/2010 12:46 AM Ramiro Polla


Originally committed as revision 24894 to svn://

c4ab519e 08/23/2010 02:46 PM Vitor Sessak

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)....

84c03869 08/11/2010 11:44 AM Stefano Sabatini

Change avfilter_open() signature, from:
AVFilterContext *avfilter_open(AVFilter *filter, const char *inst_name);
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...

cc80caff 08/11/2010 11:06 AM S.N. Hemanth Meenakshisunda...

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....

5d4890d7 08/07/2010 01:15 AM S.N. Hemanth Meenakshisunda...

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...

7fce481a 08/07/2010 01:15 AM S.N. Hemanth Meenakshisunda...

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$....

ecc8dada 08/07/2010 01:15 AM S.N. Hemanth Meenakshisunda...

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://

126b638e 07/26/2010 11:12 PM Stefano Sabatini

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

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

065a20cb 07/26/2010 01:39 PM Stefano Sabatini


Originally committed as revision 24506 to svn://

3aace1bc 07/26/2010 01:39 PM Stefano Sabatini

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://

639e4ec8 07/25/2010 02:42 PM Stefano Sabatini

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://

f62c025a 07/25/2010 02:41 PM Stefano Sabatini

Use X ? Y : Z construct, simplify.

Originally committed as revision 24496 to svn://

f7bd4a8e 07/25/2010 10:42 AM Stefano Sabatini

Cosmetics: rename enc -> dec in opt_input_file().

The variable refer to a decoder context, the old name was

Originally committed as revision 24492 to svn://

d62ccec8 07/18/2010 06:20 PM Jai Menon

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://

961e4a33 07/15/2010 11:53 AM Jai Menon

FFmpeg : Close input file and free any related memory if
av_find_stream_info fails.

Originally committed as revision 24247 to svn://

748db0fc 07/05/2010 02:49 PM Michael Niedermayer

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://

9f434b65 07/04/2010 08:59 PM Stefano Sabatini

Make opt_pad() print more information.

Originally committed as revision 24050 to svn://

74dc99f2 07/04/2010 08:59 PM Stefano Sabatini

Update help message for the -pad* options, as they have been removed,
and update the manual page accordingly.

Based on a patch by John Calcote $(echo "<>" | tr "b-za" "a-z").

Originally committed as revision 24049 to svn://

3c5e1b36 07/03/2010 11:24 PM Baptiste Coudurier

LOL, 100l, really fix warning:
ffmpeg.c: In function 'new_audio_stream':
ffmpeg.c:665: warning: 'best' may be used uninitialized in this function
ffmpeg.c:665: note: 'best' was declared here

Originally committed as revision 24034 to svn://

947cbeca 07/03/2010 11:22 PM Baptiste Coudurier

Fix warning:
ffmpeg.c: In function 'new_audio_stream':
ffmpeg.c:665: warning: 'best' may be used uninitialized in this function
ffmpeg.c:665: note: 'best' was declared here

Originally committed as revision 24033 to svn://

2d525ef4 07/03/2010 03:35 PM Rodney Baker

Change all occurences of "inofficial" to "unofficial" in code, comments
and options. Keep old options until next major version bump.

Patch by Rodney Baker, rodney d baker a iinet d net d au

Originally committed as revision 24021 to svn://

8abcbf2d 07/03/2010 10:12 AM Baptiste Coudurier

Reduce codec time base when stream copying

Originally committed as revision 24019 to svn://

f96363df 07/03/2010 03:11 AM Baptiste Coudurier

Set graph swscale opts before parsing it, that way opts are available
when auto-adding scalers.

Originally committed as revision 24015 to svn://

2b4abbd6 07/01/2010 06:49 PM Stefano Sabatini

Move colorspace.h from libavcodec to libavutil.
Avoid a compile-time dependency of the pad filter on libavcodec.

Originally committed as revision 23940 to svn://

006e8108 06/30/2010 10:35 PM Mike Scheutzow

Add new option "streamid" to set the value of an outfile streamid.

Patch by Mike Scheutzow, scheutzow alcatel-lucent com

Originally committed as revision 23917 to svn://

2829ce4b 06/26/2010 10:23 PM Måns Rullgård

Remove PPC perf counter support

This functionality is better accessed through tools like oprofile.

Originally committed as revision 23808 to svn://

25d34458 06/22/2010 10:54 PM Stefano Sabatini

Rename rec_timestamp to recording_timestamp, for consistency with

Originally committed as revision 23727 to svn://

28db3215 06/21/2010 04:15 AM Alexander Strange

ffmpeg: cosmetics: combine two variable declarations

Originally committed as revision 23677 to svn://

54a13282 06/14/2010 05:35 PM Michael Niedermayer

Deprecate -crop* arguments, they currently are buggy (issue1957) and probably
will be fixed by removing them.

Originally committed as revision 23607 to svn://

e91376d1 06/10/2010 07:50 PM Justin Ruggles

10l: audio_buf is already a uint8_t* so no need to cast it

Originally committed as revision 23571 to svn://

79c85beb 06/10/2010 07:40 PM Justin Ruggles

Allocate enough memory for audio_buf to fit a full output frame.
Also, use audio_buf when encoding the final frame.
Fixes Issue 1921.

Originally committed as revision 23570 to svn://

a1629e28 06/10/2010 04:51 PM Diego Biurrun

Remove support for pre-Haiku, non-POSIX, non-C99 BeOS variants.

BeOS support has been broken for many years and the "maintainer" of the port
has not reacted to countless requests to get the port fixed.
approved by Mans

Originally committed as revision 23562 to svn://

b659c8b4 06/08/2010 07:27 PM Luca Abeni

In case of stream copy, copy the extradata from the input codec context to
the output codec context (instead of just copying a pointer to the extradata).

Originally committed as revision 23538 to svn://

83a36b2e 06/03/2010 06:40 PM Stefano Sabatini

Change type of {audio,video,subtitle}_codec_tag variables from int to
unsigned int, as the corresponding variable set in
AVCodecContext.codec_tag is unsigned int.

Originally committed as revision 23441 to svn://

770e50ae 05/31/2010 10:35 PM Janne Grunau

ffmpeg: offer alternatives for experimental codecs if they exist

Originally committed as revision 23398 to svn://

4e605bc3 05/31/2010 10:31 PM Janne Grunau

ffmpeg: fail if user selected codec is experimental and strict_std_compliance > experimental

Originally committed as revision 23397 to svn://

c56e9e05 05/22/2010 09:32 PM Ramiro Polla

Open 2-pass logfile in binary mode for both reading and writing.
This fixes a regression on Windows introduced by r22769 in which the data read
from the file was not properly zero terminated. The file was read as text,
which caused the \r characters to be suppressed. Since the zero termination...

521cfa4a 05/12/2010 01:47 AM Baptiste Coudurier

rename -vfilters cli option to -vf

Originally committed as revision 23100 to svn://

d21f58b5 05/11/2010 05:25 PM Baptiste Coudurier

cosmetics, rename loop to frame_available

Originally committed as revision 23092 to svn://

a9f3cb93 05/11/2010 05:23 PM Baptiste Coudurier

rename curr_filter to last_filter, factorize filter declaration

Originally committed as revision 23091 to svn://

79b90b25 05/11/2010 05:18 PM Baptiste Coudurier

cosmetics: indentation, whitespaces

Originally committed as revision 23090 to svn://

6e82e7fa 05/11/2010 05:16 PM Baptiste Coudurier

simplify, reuse existing args variable

Originally committed as revision 23089 to svn://

aa1249b8 05/11/2010 05:14 PM Baptiste Coudurier

cosmetics: filt_graph_all -> graph, like in ffplay.c

Originally committed as revision 23088 to svn://

0c22311b 05/07/2010 12:16 PM Michael Niedermayer

Remove messy pading hack in ffmpeg.c.
Use avfilters if you want padding!

Originally committed as revision 23050 to svn://