Statistics
| Branch: | Revision:

ffmpeg / ffmpeg.c @ 99778631

History | View | Annotate | Download (154 KB)

# Date Author Comment
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://svn.ffmpeg.org/ffmpeg/trunk

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

cosmetics, rename loop to frame_available

Originally committed as revision 23092 to svn://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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

cosmetics: indentation, whitespaces

Originally committed as revision 23090 to svn://svn.ffmpeg.org/ffmpeg/trunk

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

simplify, reuse existing args variable

Originally committed as revision 23089 to svn://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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

avfilter support for ffmpeg

Originally committed as revision 23043 to svn://svn.ffmpeg.org/ffmpeg/trunk

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

Print warnig if requested samplingrate is unsupported.

Originally committed as revision 22991 to svn://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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

Reindent.

Originally committed as revision 22798 to svn://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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

Use AVDISCARD_DEFAULT for 0 where appropriate.

Originally committed as revision 22787 to svn://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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

Originally committed as revision 22731 to svn://svn.ffmpeg.org/ffmpeg/trunk

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

10l: fix build without termios.h

Originally committed as revision 22604 to svn://svn.ffmpeg.org/ffmpeg/trunk

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

Register atexit handler only when needed

Originally committed as revision 22599 to svn://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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

ffmpeg: Combine variable declaration and definition

Originally committed as revision 22537 to svn://svn.ffmpeg.org/ffmpeg/trunk

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

ffmpeg: Factor out redundant sync_ipts calculation

Originally committed as revision 22536 to svn://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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

Attempt to fix issue1728 and regression of issue203

Originally committed as revision 22011 to svn://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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

Use av_get_pix_fmt() instead of the deprecated avcodec_get_pix_fmt()
function.

Originally committed as revision 21550 to svn://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

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://svn.ffmpeg.org/ffmpeg/trunk

7a086a85 01/23/2010 01:25 AM Michael Niedermayer

Fix heap overflow with -async.
Fixes issue1666

Originally committed as revision 21390 to svn://svn.ffmpeg.org/ffmpeg/trunk

40ccc754 01/20/2010 10:55 PM Måns Rullgård

Indent

Originally committed as revision 21359 to svn://svn.ffmpeg.org/ffmpeg/trunk

68cf92ee 01/20/2010 10:55 PM Måns Rullgård

Always call avcodec_thread_init()

The various avcodec_thread_init() functions are updated to return
immediately after setting avctx->thread_count. This allows -threads 0
to pass through to codecs. It also simplifies the usage for apps
using libavcodec....

ffcc6e24 01/20/2010 06:42 AM Måns Rullgård

Add -timelimit option

This option limits the CPU time used by ffmpeg to the number of seconds
specified. After this time, the OS sends a SIGXCPU signal, which we
handle and attempt to exit cleanly. If the process is stuck, the OS
will deliver a SIGKILL one second later, forcibly terminating the...

036c1382 01/07/2010 01:15 AM Michael Niedermayer

Fix stream copy & transcoding one stream at the same time.
Fixes issue1660.

Originally committed as revision 21042 to svn://svn.ffmpeg.org/ffmpeg/trunk

9f907d85 01/07/2010 12:50 AM Michael Niedermayer

Correct indention.

Originally committed as revision 21041 to svn://svn.ffmpeg.org/ffmpeg/trunk

8157483d 01/07/2010 12:47 AM Michael Niedermayer

Move the definitions of data_buf and data_size closer to where they are used.

Originally committed as revision 21040 to svn://svn.ffmpeg.org/ffmpeg/trunk

0f52ef1a 01/01/2010 12:58 PM Stefano Sabatini

Use av_guess_format() in place of the deprecated guess_format().

Originally committed as revision 20994 to svn://svn.ffmpeg.org/ffmpeg/trunk

322aa1e2 12/28/2009 10:46 PM Michael Dorr

Do not explicitely set thread_count in the codec context.
This is already done by avcodec_thread_init().

Patch by Michael Dorr <dorr <at> inb.uni-luebeck.de>.

Originally committed as revision 20955 to svn://svn.ffmpeg.org/ffmpeg/trunk

37ce3d6b 12/25/2009 09:01 PM Michael Niedermayer

Do not copy codec_tag in stream copy case if it is associated with a different codec_id
fixes issue1568

Originally committed as revision 20921 to svn://svn.ffmpeg.org/ffmpeg/trunk

a6831e88 12/25/2009 06:32 PM Stefano Sabatini

Use positive logic, improve readability, consistent with r20877.

Originally committed as revision 20920 to svn://svn.ffmpeg.org/ffmpeg/trunk

7f11e745 12/21/2009 02:15 AM Ramiro Polla

Print usage instead of help when no files are specified.

Originally committed as revision 20905 to svn://svn.ffmpeg.org/ffmpeg/trunk

0c2a18cb 12/21/2009 02:12 AM Ramiro Polla

Split show_usage() out of show_help().

Originally committed as revision 20904 to svn://svn.ffmpeg.org/ffmpeg/trunk

8319aefe 12/21/2009 02:10 AM Ramiro Polla

Add a general [options] to the basic usage string.

Originally committed as revision 20903 to svn://svn.ffmpeg.org/ffmpeg/trunk

27daa420 12/21/2009 02:09 AM Ramiro Polla

First print the program description and then the basic usage line.

Originally committed as revision 20902 to svn://svn.ffmpeg.org/ffmpeg/trunk

0fc2c0f6 12/16/2009 12:08 PM Matthieu Crapet

Add -vlang option to set ISO 639 video stream language code.
This is similar to existing -alang & -slang options.

Patch by Matthieu Crapet m${surname} ^ gmail com.

Originally committed as revision 20880 to svn://svn.ffmpeg.org/ffmpeg/trunk

06a3c9c4 12/15/2009 11:25 PM Stefano Sabatini

Use positive logic in opt_target() for selecting the PAL/others
options, make its semantics mildly easier to compile by human minds.

Originally committed as revision 20877 to svn://svn.ffmpeg.org/ffmpeg/trunk

e6db28ce 12/15/2009 08:36 PM Matthieu Crapet

Simplify freeing of audio_language and subtitle_language.
Patch by Matthieu, mcrapet gmail com

Originally committed as revision 20875 to svn://svn.ffmpeg.org/ffmpeg/trunk

01558ee6 12/14/2009 11:18 PM Stefano Sabatini

Use symbolic names for PAL/NTSC/FILM rather than numeric constants in opt_target().
Improve readability.

Originally committed as revision 20870 to svn://svn.ffmpeg.org/ffmpeg/trunk

8b484d0f 12/14/2009 07:28 PM Vitor Sessak

Correct typo

Originally committed as revision 20868 to svn://svn.ffmpeg.org/ffmpeg/trunk

0f649d66 12/14/2009 12:40 PM Michael Niedermayer

Include dup/drop info if any frames where duplicated or droped
instead of when verbose>1.
From ffmbc0.3

Originally committed as revision 20865 to svn://svn.ffmpeg.org/ffmpeg/trunk

ed30e518 12/14/2009 12:37 PM Michael Niedermayer

Off by 1 bugfix for nb_frames_dup.
From ffmbc0.3

Originally committed as revision 20864 to svn://svn.ffmpeg.org/ffmpeg/trunk

22b16e6a 12/14/2009 03:23 AM Michael Niedermayer

Factorize ic->streams[i] out,
change from ffmbc

Originally committed as revision 20852 to svn://svn.ffmpeg.org/ffmpeg/trunk

e4637d6a 12/13/2009 01:49 PM Michael Niedermayer

Show help if no cmd line options are provided at all.
This safes the users time to find out which of -h --help -? works.

Originally committed as revision 20822 to svn://svn.ffmpeg.org/ffmpeg/trunk

c5dc6026 12/12/2009 05:45 PM Stefano Sabatini

Move list_fmts() from ffmpeg.c to cmdutils.{h,c}, so that it can be
shared by the other ff* tools code.

Originally committed as revision 20812 to svn://svn.ffmpeg.org/ffmpeg/trunk

e185a2f6 12/08/2009 02:50 PM Michael Niedermayer

Do as the comment says and signal an error.

Originally committed as revision 20770 to svn://svn.ffmpeg.org/ffmpeg/trunk

b8919a30 12/08/2009 02:48 PM Michael Niedermayer

10l bug, use av_fast_malloc() instead if av_malloc() for allocating audio
buffers.
This and the previous revision fix a heap overflow.

Originally committed as revision 20769 to svn://svn.ffmpeg.org/ffmpeg/trunk

15bfe412 12/08/2009 02:28 PM Michael Niedermayer

Try to allocate audio buffer sizes depending on the number of input bytes.
Fixes issue1167.

Originally committed as revision 20768 to svn://svn.ffmpeg.org/ffmpeg/trunk

5ee05a62 12/08/2009 02:18 PM Michael Niedermayer

Check that the buffer size speified to avcodec_encode_audio() is not larger than the actual size.

Originally committed as revision 20767 to svn://svn.ffmpeg.org/ffmpeg/trunk

060b8592 12/08/2009 02:10 PM Michael Niedermayer

Do not assume that av_get_bits_per_sample() is a multiple of 8.

Originally committed as revision 20766 to svn://svn.ffmpeg.org/ffmpeg/trunk

80f47250 12/07/2009 04:26 PM Michael Niedermayer

Get rid of audio_out2, it seems unneeded.

Originally committed as revision 20760 to svn://svn.ffmpeg.org/ffmpeg/trunk

33946533 12/05/2009 05:51 PM Jai Menon

Update frame_width and frame_height based on the lowres value.
Fixes issues 1387, 1097 and probably some other lowres related problems.

Originally committed as revision 20741 to svn://svn.ffmpeg.org/ffmpeg/trunk

ef6fc647 12/05/2009 03:14 PM Stefano Sabatini

Add 'const' attribute to the last_asked_format variable, fix a
compiler warning.

Originally committed as revision 20740 to svn://svn.ffmpeg.org/ffmpeg/trunk

b83ccbff 12/04/2009 04:20 PM Michael Niedermayer

Do not crash on frame size changes.
Fixes issue1481.

Originally committed as revision 20730 to svn://svn.ffmpeg.org/ffmpeg/trunk

15e65f83 12/03/2009 12:55 AM Ramiro Polla

Update help text for -fpre option to make it a little less confusing.

Originally committed as revision 20713 to svn://svn.ffmpeg.org/ffmpeg/trunk

992f8eae 11/29/2009 11:12 PM Stefano Sabatini

Factorize common commandline options definition.

Originally committed as revision 20664 to svn://svn.ffmpeg.org/ffmpeg/trunk

bc7eb330 11/27/2009 08:20 PM Michael Niedermayer

Remove "frame size must be a multiple of 2" check.
This check only caught explicitly set sizes from the cmd line and overriding
the users wish seems silly, especially as it seems to work.

Originally committed as revision 20634 to svn://svn.ffmpeg.org/ffmpeg/trunk

9ff261a2 11/25/2009 11:33 PM Michael Niedermayer

Remove special case that changed video sync behavior for av_q2d(enc->time_base) <= 0.001.
This should make the default behave more like one would expect and not
change behavior at 1000fps.

Originally committed as revision 20615 to svn://svn.ffmpeg.org/ffmpeg/trunk

8447f0bd 11/19/2009 04:35 PM Michael Niedermayer

Split show_formats().

Originally committed as revision 20553 to svn://svn.ffmpeg.org/ffmpeg/trunk

20026733 11/02/2009 11:44 PM Ramiro Polla

Indent.

Originally committed as revision 20436 to svn://svn.ffmpeg.org/ffmpeg/trunk