Statistics
| Branch: | Revision:

ffmpeg / ffmpeg.c @ ffcc6e24

History | View | Annotate | Download (145 KB)

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

a75e1034 11/02/2009 11:41 PM Ramiro Polla

Add -fpre option to take a preset file as parameter. The -[avs]pre options no
longer accept filenames, and -fpre should be used instead.

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

a5abfd8f 10/30/2009 09:57 AM Etienne Buira

Issue an error when forced format cannot be honored.
Patch by Etienne Buira $name $surname lists chez free.fr

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

43d160fd 10/02/2009 07:06 PM Stefano Sabatini

Prefer "loglevel" over "logging level number or string" as argname of
the loglevel command line option.

Make the loglevel option help message more clear, since the option
argument is shown as a single token, and make the whole message better
aligned with the other help messages....

d859bb1d 09/16/2009 03:08 PM Sascha Sommer

Add CODEC_CAP_SUBFRAMES for codecs that output multiple subframes
per AVPacket
No longer print "Multiple frames in a packet" error message
when CODEC_CAP_SUBFRAMES is set (wmapro, wavpack)

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

9d66ef18 09/16/2009 12:45 PM Sascha Sommer

fix PTS calculation for audio formats with bits per sample != 16

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

7ef61879 09/12/2009 05:22 PM Ramiro Polla

Check for return value of some context allocations.

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

7f4fca03 08/26/2009 10:22 AM Reimar Döffinger

Increase maximum encoded subtitle size from 64 kB to 1 MB.
Fixes "dvd_subtitle too big" errors when encoding HD video subtitles
to DVD format.

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

8b03c014 08/26/2009 08:43 AM Reimar Döffinger

Make sure that start_display_time is 0 by moving its value onto pts.
If it was not 0, subtitle encoding would fail.

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

266649a5 08/15/2009 12:37 AM Reimar Döffinger

100l, error out if subtitle encoder failed instead of writing an AVPacket
with ridiculous size and thus crashing.

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

966116b9 08/07/2009 02:53 PM Diego Biurrun

Remove some hunks of unused and disabled code cruft.

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

e9a832e5 07/27/2009 01:01 PM Martin Storsjö

Change type of received_sigterm variable from sig_atomic_t to int,
which is more portable (works on Windows CE).
patch by Martin Storsjö, martin martin st

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

a2f4324b 07/24/2009 12:13 AM Martin Storsjö

Check for HAVE_ISATTY.
Patch by Martin Storsjö <martin at martin dot st>

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

64cd8050 07/16/2009 10:32 PM Lou Logan

Rename invalid option name "gop" to "g" in opt_target(), so that
-target *-dvd works correctly.

Patch by Lou Logan <$firstname@fakeoutdoorsman com>.

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

340e2303 07/04/2009 08:18 AM Carl Eugen Hoyos

Use enum CodecID instead of int.
Fixes the following icc warning:
warning #188: enumerated type mixed with another type

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

01a3c821 06/26/2009 01:08 AM Jason Garrett-Glaser

Handle variable input stream pixfmts using the same framework introduced
by the variable frame size patch. Fixes at least issue 1165.

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

f356fc57 06/21/2009 01:59 AM Baptiste Coudurier

clarify encoder and decoder opening error messages

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

352666c1 06/19/2009 02:43 PM Eric Buehl

Support varying frame sizes in a single file.
patch by Eric Buehl, eric.buehl gmail com

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

4bbe788a 06/19/2009 08:28 AM Reimar Döffinger

Add pts field to AVSubtitle, for use by future XSUB encoder (and XSUB decoder
should use it, too).

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

4c97a6fa 06/16/2009 11:09 PM Stefano Sabatini

Move opt_loglevel() from ffmpeg.c to cmdutils.c.

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

77ddf4df 06/16/2009 11:02 PM Ramiro Polla

Make ffmpeg able to set the loglevel option using strings
corresponding to the various log levels.

Patch by Ramiro.

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

d310d56a 06/14/2009 11:55 PM Baptiste Coudurier

do not use av_parser_change for h264 which uses bitstream filter, fix #1027

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

50f3fabc 06/14/2009 11:14 PM Måns Rullgård

Print error message when output buffer allocation fails

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

761c8c92 06/12/2009 08:15 AM Baptiste Coudurier

Fail and print correct error message when video stream pixel format
is unknown.

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

aa9b754f 06/11/2009 04:07 AM Baptiste Coudurier

Remove even condition on pad and crop.
Odd padding or cropping is needed when encoders only support
even resolution.

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

9e1cc598 05/31/2009 08:19 PM Ramiro Polla

indent

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

85121858 05/31/2009 08:17 PM Ramiro Polla

Remove useless if(), leftover from the vhook removal.

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

54e28a85 05/30/2009 02:48 AM Baptiste Coudurier

remove commented code using real_pict_num

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

b10d7e4e 05/23/2009 04:07 AM Baptiste Coudurier

pad last audio frame when encoding

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

ecfe3929 05/22/2009 10:51 PM Stefano Sabatini

Remove duplicated RGB_TO_[YUV] macros, use those included in
libavcodec/colorspace.h.

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

de961801 05/12/2009 12:47 AM David Conrad

Copy input codec's chroma_sample_location to output codec when transcoding.
Currently only used by yuv4mpeg.

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

80b9d636 04/27/2009 07:13 AM Benoit Fouet

Make function pointer assignments consistent in option handling.

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

4eac2e89 04/24/2009 11:56 AM Wolfram Gloger

Change return type of opt_loglevel() from void to int.
Patch by Wolfram Gloger: wmglo (your at here) dent med uni (minus) muenchen de

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

a39b76ea 04/23/2009 11:30 PM Michael Niedermayer

Don't loose bits_per_raw_sample when transcoding.

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

be233a56 04/19/2009 02:05 PM Justin Ruggles

Check that channel layout is compatible with number of channels for
output audio stream.

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

b716c6c6 04/17/2009 03:33 PM Michael Niedermayer

Remove unneeded assignment from av_encode() found by CSA.

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

b5ee9c23 04/17/2009 03:15 PM Michael Niedermayer

Remove unused variable from print_report() found by CSA.

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

505b6d11 04/17/2009 03:03 PM Michael Niedermayer

Remove unneeded assignment in ffmpeg.c found by CSA.

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

22c4c3e0 04/14/2009 03:48 AM Justin Ruggles

Support audio sample formats than S16 when encoding a small last frame.

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

7c8689ef 04/14/2009 12:20 AM Baptiste Coudurier

set pkt duration for last smaller frame, should fix alac in m4a muxing

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

c573eb85 04/13/2009 09:22 PM Baptiste Coudurier

fix indentation

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

3321cb3f 04/13/2009 03:55 AM Baptiste Coudurier

move audio buffers declarations and free them in av_exit

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

5973490a 04/13/2009 03:47 AM Baptiste Coudurier

move freeing code before exiting because of signal

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

3b801075 04/13/2009 03:43 AM Baptiste Coudurier

free options contexts in av_exit, valgrind should be happy now

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

031e14ea 04/11/2009 10:04 PM Thilo Borgmann

Fix initialization of avpkt in output_packet().

Patch by Thilo Borgmann thilo.surname AT googlemaildotcom.

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

ede0e475 04/10/2009 12:53 PM Thilo Borgmann

Use the new avcodec_decode_* API.

Patch by Thilo Borgmann th_lo.borgm_n_@goog_email.co_.

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

cdf38a17 04/09/2009 12:13 AM Michael Niedermayer

Fix -ss / -t interaction with -acodec copy.
Fixes issue203

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

b9edbe99 03/20/2009 01:23 AM Baptiste Coudurier

do not write ffm write index by default, detect if file is being written and return EOF

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

90da2b50 03/19/2009 10:29 PM Stefano Sabatini

Make ffmpeg fail if the argument provided to the -pix_fmt option is
invalid.

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

29c66386 03/18/2009 09:38 PM Stefano Sabatini

Use read_yesno() in opt_output_file().

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

eab5168c 03/18/2009 09:34 PM Stefano Sabatini

Flush the remaning chars in the input buffer after reading the
response to the "Overwrite ? [y/N]" question.

Fix the behaviour when the question is asked more than one time.

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

3d45a83a 03/15/2009 07:23 AM Baptiste Coudurier

add loglevel option to set libav* logging level, -v does not set it anymore

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

27ad7d3a 03/11/2009 08:14 AM Baptiste Coudurier

stag option to force subtitle tag

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

00b7fbdc 03/11/2009 06:13 AM Baptiste Coudurier

10l, set ret to 0 when finished

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

002c95d7 03/11/2009 06:06 AM Baptiste Coudurier

dump_format after av_write_header to print updated parameters

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

3898eed8 03/09/2009 05:47 PM Reimar Döffinger

Reorder arguments for av_fifo_generic_read to be more logical and
consistent with av_fifo_generic_write.

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

c957c854 03/08/2009 02:42 PM Reimar Döffinger

Replace all uses of the replaced av_fifo_read by av_fifo_generic_read

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

41dd680d 03/08/2009 02:16 PM Michael Niedermayer

Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
Yes this breaks ABI/API but ive already broken it and will bump avutil major
soon.

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

636f1c4c 03/03/2009 11:32 PM Stefano Sabatini

Rename avctx_opts to avcodec_opts.

The new name is more meaningful and consistent with avformat_opts
and sws_opts.

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

1ad1eaad 03/03/2009 08:25 PM Michael Niedermayer

Enable AVFMT_FLAG_NONBLOCK.

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

d61f30a7 03/03/2009 08:24 PM Michael Niedermayer

Do usleep(10000) when all demuxers returned EAGAIN.

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

545465ec 03/03/2009 07:50 PM Michael Niedermayer

If a demuxer returns EAGAIN, try another demuxer.

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

fdf11906 03/03/2009 02:09 PM Diego Biurrun

Remove deprecated vhook subsystem.

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

0a789246 03/01/2009 03:58 PM Aurelien Jacobs

fix last usage of old metadata API in ffmpeg.c (handling of AVStream language)

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