Commit Graph

1061 Commits

Author SHA1 Message Date
Baptiste Coudurier 6e82e7fa48 simplify, reuse existing args variable
Originally committed as revision 23089 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 17:16:52 +00:00
Baptiste Coudurier aa1249b8aa cosmetics: filt_graph_all -> graph, like in ffplay.c
Originally committed as revision 23088 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 17:14:36 +00:00
Michael Niedermayer 0c22311b56 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
2010-05-07 12:16:23 +00:00
Michael Niedermayer bdab692f48 Make sure get_filtered_video_pic() doesnt loose interlacedframe/tff.
Originally committed as revision 23049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-07 12:05:24 +00:00
Michael Niedermayer 46847a336e avfilter support for ffmpeg
Originally committed as revision 23043 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-07 09:43:21 +00:00
Michael Niedermayer ff866063e9 Print warnig if requested samplingrate is unsupported.
Originally committed as revision 22991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 00:06:36 +00:00
Stefano Sabatini a31e795607 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
2010-04-26 22:36:55 +00:00
Stefano Sabatini 2ef6c1242a 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
2010-04-25 14:27:42 +00:00
Michael Niedermayer 10d0f5e035 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
2010-04-22 09:40:51 +00:00
Cyril Russo 9b157b0ccd 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
2010-04-22 08:55:23 +00:00
Robert Krüger 2328e5a289 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
2010-04-20 17:37:06 +00:00
Baptiste Coudurier f32f7d8b24 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
2010-04-16 22:58:56 +00:00
Anton Khirnov 46e6fb4c54 Simplify writing stream metadata.
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22809 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-05 19:54:11 +00:00
Anton Khirnov 1a6498d78c 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
2010-04-05 19:53:25 +00:00
Stefano Sabatini 685598f58d Reindent.
Originally committed as revision 22798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-04 13:50:38 +00:00
Stefano Sabatini ac61f59a76 Rename av_encode() to av_transcode(), the new name is more meaningful.
Originally committed as revision 22797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-04 13:50:34 +00:00
Carl Eugen Hoyos 18590be655 Use AVDISCARD_DEFAULT for 0 where appropriate.
Originally committed as revision 22787 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02 23:08:23 +00:00
Stefano Sabatini 458b062d61 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
2010-04-01 22:34:22 +00:00
Ronald S. Bultje d9521cb119 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
avcodec_context_get_defaults() and have ffmpeg figure out the optimal encoding
format itself if not set explicitely (as it does for the non-ffserver-cases
also).

Originally committed as revision 22751 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 21:02:34 +00:00
Jean-Daniel Dupas cc947f04cc 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
2010-03-31 12:29:58 +00:00
Stefano Sabatini 72415b2adb 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
2010-03-30 23:30:55 +00:00
Ronald S. Bultje aa1de0d9ed 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
2010-03-30 19:37:07 +00:00
Måns Rullgård 64f6e357fd 10l: fix build without termios.h
Originally committed as revision 22604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-20 01:02:45 +00:00
Måns Rullgård 9a9509e6ee Register atexit handler only when needed
Originally committed as revision 22599 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-19 16:25:11 +00:00
Anton Khirnov 7a39f142a8 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
2010-03-19 07:44:38 +00:00
Ronald S. Bultje 562f22a699 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
2010-03-16 15:48:48 +00:00
Michael Niedermayer 802323508c 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
2010-03-15 19:45:57 +00:00
Alexander Strange d55065a29f ffmpeg: Combine variable declaration and definition
Originally committed as revision 22537 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 02:33:49 +00:00
Alexander Strange 47b229dbab ffmpeg: Factor out redundant sync_ipts calculation
Originally committed as revision 22536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 02:32:21 +00:00
Måns Rullgård 335ee1aadd 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
use them without being exposed to internal interfaces.

This use of a non-public header is justified by the header in question
not being part of the internal interface either.  It should rather be
considered as part of the build system, which is shared between the
libraries and the applications.

This header cannot be installed since the tested conditions depend on
the compiler.

Originally committed as revision 22399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 15:10:23 +00:00
Måns Rullgård 6580d5e377 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
2010-03-07 22:18:37 +00:00
Alex Converse 660822f0ae ffmpeg.c: Don't use NULL for integer metadata flags.
Originally committed as revision 22205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 11:27:39 +00:00
Stefano Sabatini 8c8bf9ecfc 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
2010-03-02 00:01:16 +00:00
Chris Stones 49b609820d 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
2010-03-01 16:47:44 +00:00
Anton Khirnov c71591a509 ffmpeg: copy stream metadata.
Patch by Anton Khirnov wyskasgmailcom

Originally committed as revision 22126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-01 07:22:59 +00:00
Francesco Cosoleto 6abda15f56 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
2010-02-26 14:46:20 +00:00
Michael Niedermayer a15fdd7ce3 Attempt to fix issue1728 and regression of issue203
Originally committed as revision 22011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 23:41:11 +00:00
Michael Niedermayer b8c93c483b 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
2010-02-23 22:06:36 +00:00
Michael Niedermayer 247e3954fc 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
2010-02-23 16:31:14 +00:00
Michael Niedermayer 6d3d3b836f 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
2010-02-23 15:08:41 +00:00
Reimar Döffinger fc5607f862 Make -benchmark also print the maximum memory usage if possible.
Originally committed as revision 21973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 22:21:58 +00:00
Wolfram Gloger 23b361baca 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
2010-02-11 21:54:09 +00:00
Reimar Döffinger 40938d9382 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
2010-02-10 19:46:44 +00:00
Wolfram Gloger 55a7e946f6 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
2010-02-08 09:04:06 +00:00
Justin Johnson 86a4f011e6 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
(i seem to have missed that)
Also it can segfault see ([FFmpeg-devel] rtp streaming x264+audio issues (and some ideas to fix them))

Originally committed as revision 21652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-06 11:11:10 +00:00
Stefano Sabatini 6e2fdc3eb1 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
2010-02-06 00:10:42 +00:00
Stefano Sabatini cedac88250 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
2010-02-03 19:55:45 +00:00
Michael Niedermayer f575f08ccb 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
in different order.

Originally committed as revision 21626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 15:09:04 +00:00
Michael Niedermayer 5bfe91e683 Alternative solution for the mpegvideo_split + mov problem.
Originally committed as revision 21625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 14:53:14 +00:00
Justin Johnson c5e1e9827d 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
2010-02-02 22:23:09 +00:00
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
Ramiro Polla 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
Reimar Döffinger 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
Reimar Döffinger 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
Reimar Döffinger 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
Diego Biurrun 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
Martin Storsjö 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
Martin Storsjö 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
Lou Logan 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
Carl Eugen Hoyos 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
Jason Garrett-Glaser 01a3c821a2 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
2009-06-26 01:08:26 +00:00
Baptiste Coudurier f356fc5799 clarify encoder and decoder opening error messages
Originally committed as revision 19243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-21 01:59:05 +00:00
Eric Buehl 352666c17c 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
2009-06-19 14:43:36 +00:00
Reimar Döffinger 4bbe788ab7 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
2009-06-19 08:28:07 +00:00
Stefano Sabatini 4c97a6fafa Move opt_loglevel() from ffmpeg.c to cmdutils.c.
Originally committed as revision 19209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 23:09:03 +00:00
Ramiro Polla 77ddf4df94 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
2009-06-16 23:02:53 +00:00
Baptiste Coudurier d310d56a36 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
2009-06-14 23:55:25 +00:00
Måns Rullgård 50f3fabc48 Print error message when output buffer allocation fails
Originally committed as revision 19194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 23:14:54 +00:00
Baptiste Coudurier 761c8c923e 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
2009-06-12 08:15:37 +00:00
Baptiste Coudurier aa9b754ffc 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
2009-06-11 04:07:29 +00:00
Ramiro Polla 9e1cc5984c indent
Originally committed as revision 19071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 20:19:16 +00:00
Ramiro Polla 851218584e Remove useless if(), leftover from the vhook removal.
Originally committed as revision 19070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 20:17:58 +00:00
Baptiste Coudurier 54e28a852c remove commented code using real_pict_num
Originally committed as revision 18989 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 02:48:47 +00:00
Baptiste Coudurier b10d7e4e3a pad last audio frame when encoding
Originally committed as revision 18907 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-23 04:07:25 +00:00
Stefano Sabatini ecfe3929da 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
2009-05-22 22:51:46 +00:00
David Conrad de96180137 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
2009-05-12 00:47:19 +00:00
Benoit Fouet 80b9d6366f Make function pointer assignments consistent in option handling.
Originally committed as revision 18697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-27 07:13:50 +00:00
Wolfram Gloger 4eac2e8901 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
2009-04-24 11:56:23 +00:00
Michael Niedermayer a39b76ea7d Don't loose bits_per_raw_sample when transcoding.
Originally committed as revision 18671 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-23 23:30:16 +00:00
Justin Ruggles be233a5691 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
2009-04-19 14:05:55 +00:00
Michael Niedermayer b716c6c6a6 Remove unneeded assignment from av_encode() found by CSA.
Originally committed as revision 18567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 15:33:45 +00:00
Michael Niedermayer b5ee9c2334 Remove unused variable from print_report() found by CSA.
Originally committed as revision 18566 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 15:15:25 +00:00
Michael Niedermayer 505b6d1147 Remove unneeded assignment in ffmpeg.c found by CSA.
Originally committed as revision 18562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 15:03:51 +00:00
Justin Ruggles 22c4c3e059 Support audio sample formats than S16 when encoding a small last frame.
Originally committed as revision 18505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-14 03:48:26 +00:00
Baptiste Coudurier 7c8689ef54 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
2009-04-14 00:20:52 +00:00
Baptiste Coudurier c573eb85f0 fix indentation
Originally committed as revision 18500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 21:22:19 +00:00
Baptiste Coudurier 3321cb3f6e move audio buffers declarations and free them in av_exit
Originally committed as revision 18486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 03:55:26 +00:00
Baptiste Coudurier 5973490a8f move freeing code before exiting because of signal
Originally committed as revision 18485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 03:47:12 +00:00
Baptiste Coudurier 3b80107596 free options contexts in av_exit, valgrind should be happy now
Originally committed as revision 18484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 03:43:29 +00:00
Thilo Borgmann 031e14ea79 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
2009-04-11 22:04:52 +00:00
Thilo Borgmann ede0e47507 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
2009-04-10 12:53:22 +00:00
Michael Niedermayer cdf38a17fb Fix -ss / -t interaction with -acodec copy.
Fixes issue203

Originally committed as revision 18382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-09 00:13:59 +00:00
Baptiste Coudurier b9edbe9953 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
2009-03-20 01:23:33 +00:00
Stefano Sabatini 90da2b5086 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
2009-03-19 22:29:32 +00:00
Stefano Sabatini 29c6638668 Use read_yesno() in opt_output_file().
Originally committed as revision 18038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-18 21:38:41 +00:00
Stefano Sabatini eab5168cd3 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
2009-03-18 21:34:19 +00:00
Baptiste Coudurier 3d45a83a59 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
2009-03-15 07:23:18 +00:00
Baptiste Coudurier 27ad7d3a96 stag option to force subtitle tag
Originally committed as revision 17941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:14:19 +00:00
Baptiste Coudurier 00b7fbdcf5 10l, set ret to 0 when finished
Originally committed as revision 17931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 06:13:14 +00:00
Baptiste Coudurier 002c95d749 dump_format after av_write_header to print updated parameters
Originally committed as revision 17930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 06:06:18 +00:00
Reimar Döffinger 3898eed890 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
2009-03-09 17:47:47 +00:00
Reimar Döffinger c957c85426 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
2009-03-08 14:42:11 +00:00
Michael Niedermayer 41dd680dd8 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
2009-03-08 14:16:55 +00:00
Stefano Sabatini 636f1c4cd0 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
2009-03-03 23:32:10 +00:00
Michael Niedermayer 1ad1eaadd6 Enable AVFMT_FLAG_NONBLOCK.
Originally committed as revision 17785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 20:25:21 +00:00
Michael Niedermayer d61f30a7a0 Do usleep(10000) when all demuxers returned EAGAIN.
Originally committed as revision 17784 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 20:24:58 +00:00
Michael Niedermayer 545465ecaa If a demuxer returns EAGAIN, try another demuxer.
Originally committed as revision 17782 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 19:50:04 +00:00
Diego Biurrun fdf119062e Remove deprecated vhook subsystem.
Originally committed as revision 17769 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 14:09:10 +00:00
Aurelien Jacobs 0a7892468e 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
2009-03-01 15:58:57 +00:00
Aurelien Jacobs a5926d856b convert ffmpeg to new metadata API
Originally committed as revision 17683 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 14:54:22 +00:00
Michael Niedermayer e6fdc2b1a0 Make sure -vsync 2 does not produce timestamps equal to the previous,
rather drop a frame.
Fixes Issue872.

Originally committed as revision 17643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 14:53:29 +00:00
Michael Niedermayer fc6765d719 Update commented fprintf().
Originally committed as revision 17642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 14:44:58 +00:00
Michael Niedermayer 3797c74ba5 Add ticks_per_frame, this should hopefully fix the regressions caused
by the time_base change.

Originally committed as revision 17630 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 23:47:32 +00:00
Michael Niedermayer 34583e1bbe Fix next_pts computation to consider repeat_pict.
Originally committed as revision 17613 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:15:22 +00:00
Michael Niedermayer ad48c9f0b8 Do not duplicate frames if the muxer claims that it is not needed.
Note to release manager, this is risky and should be reverted if
it causes any problem.

Originally committed as revision 17555 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 15:06:17 +00:00
Peter Ross c027e91a74 Increase ffmpeg intermediate conversion buffer size to accomodate 48-bit RGB rawvideo
images.

Originally committed as revision 17513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 01:00:28 +00:00
Peter Ross befb5cac31 Increase ffmpeg intermediate conversion buffer size to accomodate PPM/PNM header.
Originally committed as revision 17512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 00:58:51 +00:00
Benoit Fouet 49a06a4d25 Change av_log() calls to fprintf() to stderr calls.
Originally committed as revision 17378 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 16:14:34 +00:00
Baptiste Coudurier d1e3c6fd40 extend resampling API, add S16 internal conversion
Originally committed as revision 17163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 22:57:10 +00:00
Patrik Kullman 6d0c77ba40 Use av_strlcpy instead of snprintf without formatting.
Prevents warnings about "format not a string literal and no format arguments".
patch by Patrik Kullman, patrik yes nu

Originally committed as revision 17141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 00:07:32 +00:00
Francesco Cosoleto ced06bd8fe Add the ability to set the timestamp to the current time by specifying 'now'
as the time

Patch by Francesco Cosoleto ( cosoleto gmail com )

Originally committed as revision 17076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 22:03:54 +00:00
Stefano Sabatini 8e2fd8e1d4 Replace the calls to the deprecated av_alloc_format_context() with
corresponding calls to avformat_alloc_context().

Originally committed as revision 17048 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 08:27:26 +00:00
Robert Swain 1777168269 Make opt_preset() use FFMPEG_DATADIR from config.h rather than /usr and
/usr/local

Originally committed as revision 16795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-25 23:10:56 +00:00
Michael Niedermayer 2d4eeaadc4 Workaround ffms behavior of returning EAGAIN at EOF.
Should fix regression tests & fate.

Originally committed as revision 16727 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 09:47:22 +00:00
Michael Niedermayer ad51c68c01 Handle av_read_frame() EAGAIN return.
Originally committed as revision 16717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-22 12:04:01 +00:00
Baptiste Coudurier 6c7c44ee7a exit with error code if av_encode failed
Originally committed as revision 16704 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 21:09:51 +00:00
David Conrad d43b26ea13 Copy width/height for subtitle streams (needed for scodec copy of mov/mp4
timed text)

Originally committed as revision 16662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 23:54:27 +00:00
Aurelien Jacobs 49fb20cb8a replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
and remove all ENABLE_ definitions.

Originally committed as revision 16600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-14 17:19:17 +00:00
Aurelien Jacobs b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
Michael Niedermayer 528271ff67 Check the return of audio and video encoders.
Originally committed as revision 16538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 16:15:34 +00:00
Michael Niedermayer 95af5e1c81 All negative returns are errors not just -1.
Originally committed as revision 16537 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 16:11:02 +00:00
Aurelien Jacobs 094d9df72e free all allocated metadata structures
Originally committed as revision 16457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-06 22:11:04 +00:00
Michael Niedermayer 25b4c651a3 Replace AVSubtitleRect.rgba_palette and bitmap by AVPicture.
Originally committed as revision 16416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-03 19:17:18 +00:00
Michael Niedermayer db4fac64db Change AVSubtitle.rects to an array of pointers so ABI does not break
when the size of AVSubtitleRect changes.

Originally committed as revision 16412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-03 17:54:48 +00:00
Stefano Sabatini 22730e8790 Put pass_logfilename_prefix check on a single line, improve readability.
Originally committed as revision 16351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 19:28:42 +00:00
Stefano Sabatini ad16627fa0 Rename variables:
pass_logfilename -> pass_logfilename_prefix
DEFAULT_PASS_LOGFILENAME -> DEFAULT_PASS_LOGFILENAME_PREFIX

and make clear in the passlogfile OptionDef help string that it takes
a file name prefix rather than a file name.

Originally committed as revision 16350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 19:25:24 +00:00
Wolfram Gloger 50e3477f0f Offer an option (disabled by default) to enable the copy of the frames before
the first key frame in a stream.
Patch by Wolfram Gloger wmglo /!\ dent med uni (minus) muenchen de

Originally committed as revision 16269 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-22 08:22:22 +00:00
Michael Niedermayer 09a76db8e6 Do not skip frames until the first keyframe when stream copying but
no starttime is set.
Fixes at least -vcodec copy with VS2k5DebugDemo-01-partial.avi.

Originally committed as revision 16159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-16 03:11:36 +00:00
Stefano Sabatini 76bdac6dbf Cosmetics: remove empty comments.
Originally committed as revision 16124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 15:02:27 +00:00
Diego Biurrun 9686df2be5 Delete unnecessary 'extern' keywords.
Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-03 15:23:30 +00:00
Stefano Sabatini 42d1d06e8f Make more informative the error messages regarding the access to the
2-pass log file.

Originally committed as revision 15970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-01 08:35:07 +00:00
Benjamin Larsson 13367a46bc channel layout support for ffmpeg.c
Originally committed as revision 15956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-29 19:32:42 +00:00
Stefano Sabatini 3a25ca18f3 Make rate_emu a global property rather than to be settable for a
specific input video stream.

See the thread: Fix ffmpeg -re behaviour.

Originally committed as revision 15946 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-27 21:38:42 +00:00
Stefano Sabatini cdd7157bc3 Remove AVInputStream frame variable definition and usage, unnecessary
after the last commit.

Originally committed as revision 15945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-27 21:30:03 +00:00
Stefano Sabatini cb103a194b Make the input realtime framerate emulation code use ist->pts for
computing the time of the next frame to send to output.

See the thread: fix ffmpeg -re behaviour.

Originally committed as revision 15944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-27 21:24:25 +00:00
Stefano Sabatini e178d7fd0f Make ffmpeg print in the error message the exact line of a preset file
containing an invalid option or value, and also how the option and the
value have been parsed.

Originally committed as revision 15903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-21 22:56:08 +00:00
Stefano Sabatini b04665ac02 Make ffmpeg print in the error message the exact line of a preset file
containing an invalid syntax.

Originally committed as revision 15902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-21 22:51:17 +00:00
Stefano Sabatini fc5d0db59a Improve error message in case of output file with no streams, dumping
the empty file format representation and specifying the index number
of the output file.

Originally committed as revision 15870 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 23:27:05 +00:00
Stefano Sabatini bdb9fd9b7f Improve messages printed when there is no input/output file, making
them more grammatically correct and consistent with other equivalent
messages.

Originally committed as revision 15869 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 23:18:44 +00:00
Stefano Sabatini 7a7da6b42f Remove unnecessary calls to show_help(), make ffmpeg/ffplay print a
specific error message instead.

Originally committed as revision 15868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 23:15:29 +00:00
Luca Barbato 536cd1db71 Flush SDP description
Originally committed as revision 15826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 12:32:38 +00:00