| Branch: | Revision:

ffmpeg / ffmpeg.c @ 3e1e7800

History | View | Annotate | Download (157 KB)

# Date Author Comment
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://

bdab692f 05/07/2010 12:05 PM Michael Niedermayer

Make sure get_filtered_video_pic() doesnt loose interlacedframe/tff.

Originally committed as revision 23049 to svn://

46847a33 05/07/2010 09:43 AM Michael Niedermayer

avfilter support for ffmpeg

Originally committed as revision 23043 to svn://

ff866063 04/30/2010 12:06 AM Michael Niedermayer

Print warnig if requested samplingrate is unsupported.

Originally committed as revision 22991 to svn://

a31e7956 04/26/2010 10:36 PM Stefano Sabatini

Make ffmpeg use print_error() to make apparent the exact cause of
failure happened when trying to open the output file.

Originally committed as revision 22973 to svn://

2ef6c124 04/25/2010 02:27 PM Stefano Sabatini

Mark av_metadata_set() as deprecated, and use av_metadata_set2()
in its place.

av_metadata_set() is going to be dropped at the next major bump.

Originally committed as revision 22961 to svn://

10d0f5e0 04/22/2010 09:40 AM Michael Niedermayer

Make sure ffmpeg chooses a supported samplerte if the encoder supports
just some.

Originally committed as revision 22943 to svn://

9b157b0c 04/22/2010 08:55 AM Cyril Russo

Fix compilation error of ffmpeg and ffplay with --disable-avdevice.

Patch by Cyril Russo, stage D nexvision A laposte net

Originally committed as revision 22940 to svn://

2328e5a2 04/20/2010 05:37 PM Robert Krüger

Allow setting the environment variable FFMPEG_DATADIR to locate preset files.

Patch by Robert Krüger <krueger signal7 de>.

Originally committed as revision 22923 to svn://

f32f7d8b 04/16/2010 10:58 PM Baptiste Coudurier

Take ticks per frame into account when warning about difference between
container and codec frame rate.

Originally committed as revision 22895 to svn://

46e6fb4c 04/05/2010 07:54 PM Anton Khirnov

Simplify writing stream metadata.

Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22809 to svn://

1a6498d7 04/05/2010 07:53 PM Anton Khirnov

Don't overwrite user-supplied metadata with metadata mapped from an input file.

Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22808 to svn://

685598f5 04/04/2010 01:50 PM Stefano Sabatini


Originally committed as revision 22798 to svn://

ac61f59a 04/04/2010 01:50 PM Stefano Sabatini

Rename av_encode() to av_transcode(), the new name is more meaningful.

Originally committed as revision 22797 to svn://

18590be6 04/02/2010 11:08 PM Carl Eugen Hoyos

Use AVDISCARD_DEFAULT for 0 where appropriate.

Originally committed as revision 22787 to svn://

458b062d 04/01/2010 10:34 PM Stefano Sabatini

Implement cmdutils.c:read_file(), and use it in ffmpeg.c for reading
the second pass encoding log file.

Originally committed as revision 22769 to svn://

d9521cb1 03/31/2010 09:02 PM Ronald S. Bultje

Fix FFM-based streaming from ffmpeg to ffserver. The basic problem is that
we'd memset() the codec context to zero, thereby setting audio input to U8
and video to YUV420P. For most video encoders, that actually works, but for
most audio codecs, it doesn't. This patch changes defaults to those set by...

cc947f04 03/31/2010 12:29 PM Jean-Daniel Dupas

Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.

Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://

72415b2a 03/30/2010 11:30 PM Stefano Sabatini

Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://

aa1de0d9 03/30/2010 07:37 PM Ronald S. Bultje

Split out code that auto-chooses a default pix_fmt/sample_fmt in their own

Originally committed as revision 22731 to svn://

64f6e357 03/20/2010 01:02 AM Måns Rullgård

10l: fix build without termios.h

Originally committed as revision 22604 to svn://

9a9509e6 03/19/2010 04:25 PM Måns Rullgård

Register atexit handler only when needed

Originally committed as revision 22599 to svn://

7a39f142 03/19/2010 07:44 AM Anton Khirnov

ffmpeg.c: copy chapters by default.
Patch by Anton Khirnov wyskas gmail com

Originally committed as revision 22598 to svn://

562f22a6 03/16/2010 03:48 PM Ronald S. Bultje

Typo: if output (video) stream's pix_fmt is not set, then the stream cannot
be ENcoded, not DEcoded.

Originally committed as revision 22566 to svn://

80232350 03/15/2010 07:45 PM Michael Niedermayer

Allow mpeg style yuv in jpeg when strict standard compliance is small enough.

Originally committed as revision 22553 to svn://

d55065a2 03/15/2010 02:33 AM Alexander Strange

ffmpeg: Combine variable declaration and definition

Originally committed as revision 22537 to svn://

47b229db 03/15/2010 02:32 AM Alexander Strange

ffmpeg: Factor out redundant sync_ipts calculation

Originally committed as revision 22536 to svn://

335ee1aa 03/09/2010 03:10 PM Måns Rullgård

Move libm replacements to new header libm.h

ffmpeg.c uses lrintf(), which is missing on some systems. Previously
it picked up the replacement via libavutil/internal.h due to
HAVE_AV_CONFIG_H being erroneously defined.

Moving these replacements to a separate header enables ffmpeg.c to...

6580d5e3 03/07/2010 10:18 PM Måns Rullgård

Remove hacks not required since HAVE_AV_CONFIG_H was unset for the apps

Originally committed as revision 22295 to svn://

660822f0 03/04/2010 11:27 AM Alex Converse

ffmpeg.c: Don't use NULL for integer metadata flags.

Originally committed as revision 22205 to svn://

8c8bf9ec 03/02/2010 12:01 AM Stefano Sabatini

Make ffmpeg print a message and abort if the name of the format
provided with -f was unknown.

Originally committed as revision 22140 to svn://

49b60982 03/01/2010 04:47 PM Chris Stones

Don't let output pixel format influence input pixel format.

Patch by Chris Stones, chris D stones A gmail

Originally committed as revision 22130 to svn://

c71591a5 03/01/2010 07:22 AM Anton Khirnov

ffmpeg: copy stream metadata.
Patch by Anton Khirnov wyskasgmailcom

Originally committed as revision 22126 to svn://

6abda15f 02/26/2010 02:46 PM Francesco Cosoleto

Prevent overflow of start_time + recording_time.
Patch by Francesco Cosoleto gmail($name)

Originally committed as revision 22077 to svn://

a15fdd7c 02/23/2010 11:41 PM Michael Niedermayer

Attempt to fix issue1728 and regression of issue203

Originally committed as revision 22011 to svn://

b8c93c48 02/23/2010 10:06 PM Michael Niedermayer

Set ist->pts to something that isnt guranteed to entangle itself with stream copying b frames.

Originally committed as revision 22010 to svn://

247e3954 02/23/2010 04:31 PM Michael Niedermayer

Favor streams with more packets if the user did not specify what she wants.
Fixes issue1156

Originally committed as revision 22002 to svn://

6d3d3b83 02/23/2010 03:08 PM Michael Niedermayer

Redesign opt_programid code.
Its now possible to also select programs per input file and there is
less code duplication.

Originally committed as revision 21999 to svn://

fc5607f8 02/22/2010 10:21 PM Reimar Döffinger

Make -benchmark also print the maximum memory usage if possible.

Originally committed as revision 21973 to svn://

23b361ba 02/11/2010 09:54 PM Wolfram Gloger

Remove recording_time check which is no longer necessary after r21687.

Patch by Wolfram Gloger, wmglo A dent D med D uni-muenchen D de

Originally committed as revision 21760 to svn://

40938d93 02/10/2010 07:46 PM Reimar Döffinger

Use av_compare_ts to compare against the -t end time instead of using
floating point.
Should fix different results between PPC and x86 for the idroq-video-encode
FATE test.

Originally committed as revision 21745 to svn://

55a7e946 02/08/2010 09:04 AM Wolfram Gloger

Stop reading input file when -t option value is reached.
Patch by Wolfram Gloger wmglo (chez) dent med uni (minus) muenchen de

Originally committed as revision 21687 to svn://

86a4f011 02/06/2010 11:11 AM Justin Johnson

Revert r21615 | cehoyos | 2010-02-02 23:23:09 +0100 (Tue, 02 Feb 2010) | 5 lines
Guess the duration before converting video and write guessed duration
into flv header.
Patch by Justin Johnson, justin D johnson3 A gmail

The change to ffmpeg.c is wrong as input and output files arent connected 1:1...

6e2fdc3e 02/06/2010 12:10 AM Stefano Sabatini

Add parentheses in boolean expression: (A && B || C) => ((A && B) || C),
fix the warning:
ffmpeg.c: In function ‘output_packet’:
ffmpeg.c:1317: warning: suggest parentheses around && within ||

Originally committed as revision 21650 to svn://

cedac882 02/03/2010 07:55 PM Stefano Sabatini

Make opt_frame_pix_fmt() call show_pix_fmts() if the provided option
is "list".

Originally committed as revision 21628 to svn://

f575f08c 02/03/2010 03:09 PM Michael Niedermayer

Correct opts calulation in ffmpeg.c.
This correct the stop point for demuxing with -vcodec copy and -t as well as
packet interleaving. (we already diddrop packets but kept demuxing them
for too long due to opts being wrong)
the change to ffm is due to 2 packets with timestamp 0 being stored...

5bfe91e6 02/03/2010 02:53 PM Michael Niedermayer

Alternative solution for the mpegvideo_split + mov problem.

Originally committed as revision 21625 to svn://

c5e1e982 02/02/2010 10:23 PM Justin Johnson

Guess the duration before converting video and write guessed duration
into flv header.

Patch by Justin Johnson, justin D johnson3 A gmail

Originally committed as revision 21615 to svn://

f8ccf720 02/01/2010 10:08 PM Michael Niedermayer

Check pkt.pts against the recording time.
This fixes at least ogg encoding with -t where the file was slightly too long.

Originally committed as revision 21598 to svn://

718c7b18 01/30/2010 07:10 PM Stefano Sabatini

Use av_get_pix_fmt() instead of the deprecated avcodec_get_pix_fmt()

Originally committed as revision 21550 to svn://

ecc544de 01/28/2010 04:17 PM Jai Menon

ffmpeg.c : Don't set AVFormatParameters::[audio|video]_codec_id
since it is no longer required.

Originally committed as revision 21513 to svn://

60402344 01/27/2010 07:11 PM Jai Menon

ffmpeg.c : Increase static limit on the maximum number of
input files.

Originally committed as revision 21483 to svn://

3ff0daf0 01/27/2010 01:27 PM Michael Niedermayer

Print "Multiple frames in a packet" warning independant of CODEC_CAP_SUBFRAMES
because CODEC_CAP_SUBFRAMES is primarely misused to hide this warning otherwise
which renders the flag completely useless.

Originally committed as revision 21480 to svn://