virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
22,542 Commits 37 Branches 400 Tags 465 MiB
0694a009b6
Commit Graph

861 Commits

Author SHA1 Message Date
Michael Niedermayer
f8ccf72005 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
 2010-02-01 22:08:45 +00:00
Stefano Sabatini
718c7b18c9 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
 2010-01-30 19:10:26 +00:00
Jai Menon
ecc544debd 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
 2010-01-28 16:17:52 +00:00
Jai Menon
60402344af ffmpeg.c : Increase static limit on the maximum number of 
input files.

Originally committed as revision 21483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-27 19:11:31 +00:00
Michael Niedermayer
3ff0daf06d 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
 2010-01-27 13:27:18 +00:00
Michael Niedermayer
7a086a852c Fix heap overflow with -async. 
Fixes issue1666

Originally committed as revision 21390 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-23 01:25:19 +00:00
Måns Rullgård
40ccc754e9 Indent 
Originally committed as revision 21359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-20 22:55:55 +00:00
Måns Rullgård
68cf92ee5e 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.

Originally committed as revision 21358 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-20 22:55:50 +00:00
Måns Rullgård
ffcc6e24f5 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
process.

This functionality is useful in automated setups where a runaway ffmpeg
process would otherwise go undetected.

Originally committed as revision 21347 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-20 06:42:39 +00:00
Michael Niedermayer
036c1382a7 Fix stream copy & transcoding one stream at the same time. 
Fixes issue1660.

Originally committed as revision 21042 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 01:15:16 +00:00
Michael Niedermayer
9f907d853f Correct indention. 
Originally committed as revision 21041 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 00:50:34 +00:00
Michael Niedermayer
8157483d64 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
 2010-01-07 00:47:23 +00:00
Stefano Sabatini
0f52ef1a00 Use av_guess_format() in place of the deprecated guess_format(). 
Originally committed as revision 20994 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 12:58:03 +00:00
Michael Dorr
322aa1e2d8 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
 2009-12-28 22:46:46 +00:00
Michael Niedermayer
37ce3d6ba7 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
 2009-12-25 21:01:16 +00:00
Stefano Sabatini
a6831e885c Use positive logic, improve readability, consistent with r20877. 
Originally committed as revision 20920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-25 18:32:16 +00:00
Ramiro Polla
7f11e745b2 Print usage instead of help when no files are specified. 
Originally committed as revision 20905 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-21 02:15:46 +00:00
Ramiro Polla
0c2a18cbcd Split show_usage() out of show_help(). 
Originally committed as revision 20904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-21 02:12:34 +00:00
Ramiro Polla
8319aefeec Add a general [options] to the basic usage string. 
Originally committed as revision 20903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-21 02:10:14 +00:00
Ramiro Polla
27daa420fc First print the program description and then the basic usage line. 
Originally committed as revision 20902 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-21 02:09:17 +00:00
Matthieu Crapet
0fc2c0f618 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
 2009-12-16 12:08:01 +00:00
Stefano Sabatini
06a3c9c45a 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
 2009-12-15 23:25:16 +00:00
Matthieu Crapet
e6db28ceb2 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
 2009-12-15 20:36:14 +00:00
Stefano Sabatini
01558ee6c9 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
 2009-12-14 23:18:49 +00:00
Vitor Sessak
8b484d0f07 Correct typo 
Originally committed as revision 20868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 19:28:33 +00:00
Michael Niedermayer
0f649d667e 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
 2009-12-14 12:40:10 +00:00
Michael Niedermayer
ed30e518e3 Off by 1 bugfix for nb_frames_dup. 
From ffmbc0.3

Originally committed as revision 20864 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 12:37:24 +00:00
Michael Niedermayer
22b16e6a5d Factorize ic->streams[i] out, 
change from ffmbc

Originally committed as revision 20852 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 03:23:45 +00:00
Michael Niedermayer
e4637d6a60 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
 2009-12-13 13:49:14 +00:00
Stefano Sabatini
c5dc602600 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
 2009-12-12 17:45:20 +00:00
Michael Niedermayer
e185a2f649 Do as the comment says and signal an error. 
Originally committed as revision 20770 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 14:50:46 +00:00
Michael Niedermayer
b8919a3092 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
 2009-12-08 14:48:36 +00:00
Michael Niedermayer
15bfe412b7 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
 2009-12-08 14:28:28 +00:00
Michael Niedermayer
5ee05a62f9 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
 2009-12-08 14:18:15 +00:00
Michael Niedermayer
060b8592d2 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
 2009-12-08 14:10:49 +00:00
Michael Niedermayer
80f4725060 Get rid of audio_out2, it seems unneeded. 
Originally committed as revision 20760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-07 16:26:37 +00:00
Jai Menon
3394653306 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
 2009-12-05 17:51:00 +00:00
Stefano Sabatini
ef6fc64762 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
 2009-12-05 15:14:01 +00:00
Michael Niedermayer
b83ccbffe9 Do not crash on frame size changes. 
Fixes issue1481.

Originally committed as revision 20730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-04 16:20:00 +00:00
Ramiro Polla
15e65f83ec 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
 2009-12-03 00:55:52 +00:00
Stefano Sabatini
992f8eaee7 Factorize common commandline options definition. 
Originally committed as revision 20664 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 23:12:19 +00:00
Michael Niedermayer
bc7eb330e3 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
 2009-11-27 20:20:44 +00:00
Michael Niedermayer
9ff261a2b2 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
 2009-11-25 23:33:47 +00:00
Michael Niedermayer
8447f0bd74 Split show_formats(). 
Originally committed as revision 20553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-19 16:35:55 +00:00
Ramiro Polla
200267333c Indent. 
Originally committed as revision 20436 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-02 23:44:11 +00:00
Ramiro Polla
a75e103432 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
 2009-11-02 23:41:54 +00:00
Etienne Buira
a5abfd8fd1 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
 2009-10-30 09:57:34 +00:00
Stefano Sabatini
43d160fd00 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.

Originally committed as revision 20149 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 19:06:27 +00:00
Sascha Sommer
d859bb1db0 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
 2009-09-16 15:08:26 +00:00
Sascha Sommer
9d66ef18fa fix PTS calculation for audio formats with bits per sample != 16 
Originally committed as revision 19880 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 12:45:24 +00:00