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
9f907d853f
Correct indention.
...
Originally committed as revision 21041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 00:50:34 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
8b484d0f07
Correct typo
...
Originally committed as revision 20868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 19:28:33 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
8447f0bd74
Split show_formats().
...
Originally committed as revision 20553 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-19 16:35:55 +00:00
200267333c
Indent.
...
Originally committed as revision 20436 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-02 23:44:11 +00:00
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
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
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
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
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
7ef618796a
Check for return value of some context allocations.
...
Originally committed as revision 19826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-12 17:22:56 +00:00
7f4fca038d
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
2009-08-26 10:22:27 +00:00
8b03c014f0
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
2009-08-26 08:43:11 +00:00
266649a52f
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
2009-08-15 00:37:31 +00:00
966116b9f7
Remove some hunks of unused and disabled code cruft.
...
Originally committed as revision 19606 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-07 14:53:31 +00:00
e9a832e508
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
2009-07-27 13:01:44 +00:00
a2f4324bb6
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
2009-07-24 00:13:59 +00:00
64cd805071
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
2009-07-16 22:32:41 +00:00
340e230392
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
2009-07-04 08:18:03 +00:00
Michael Niedermayer
Stefano Sabatini
Michael Dorr
Ramiro Polla
Matthieu Crapet
Vitor Sessak
Jai Menon
Etienne Buira
Sascha Sommer
Reimar Döffinger
Diego Biurrun
Martin Storsjö
Lou Logan
Carl Eugen Hoyos