virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
29,662 Commits 37 Branches 400 Tags 463 MiB
314374e579
Commit Graph

1161 Commits

Author SHA1 Message Date
Stefano Sabatini
97dd1e4a87 Rename avfilter_graph_destroy() to avfilter_graph_free(). 
The new name is shorter and more consistent with the rest of the API.

This change breaks libavfilter API/ABI.

Originally committed as revision 25674 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-04 20:34:24 +00:00
Stefano Sabatini
e15aeea656 Implement avfilter_graph_alloc(). 
Originally committed as revision 25673 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-04 20:34:19 +00:00
Stefano Sabatini
ba7d6e798e Remove usage of deprecated libavcodec/audioconvert.h functions. 
Originally committed as revision 25668 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-03 20:19:34 +00:00
Stefano Sabatini
da1b9b88a5 Fix timestamp computation when the timebase changes during filtering. 
The timestamps for all the buffered frames are scaled against
AV_TIME_BASE_Q, and need to be scaled back to AV_TIME_BASE_Q when they
are extracted from the filterchain.

Originally committed as revision 25646 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 18:40:59 +00:00
Anton Khirnov
45290fcdf0 ffmpeg.c: reindent 
Originally committed as revision 25637 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 06:12:56 +00:00
Anton Khirnov
d0abe80aa4 ffmpeg.c: don't autocopy stream/chapter metadata if manual mapping is specified 
Originally committed as revision 25636 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 06:12:54 +00:00
Anton Khirnov
1829e19528 ffmpeg.c: extend map_meta_data to allow advanced mappings 
i.e. to/from streams/chapters/programs.

Originally committed as revision 25635 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 06:01:28 +00:00
Stefano Sabatini
0422af7e49 Remove ffmpeg PGMYUV compatibility hack, which was deprecated since 
ages.

The user is requested to specify "-f image2" in place of "-f pgmyuv"
for reading/writing PGMYUV files, as for the other image formats.

Originally committed as revision 25629 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 00:29:13 +00:00
Stefano Sabatini
2839dc974d Use AV_RL32() in opt_codec_tag(). 
Originally committed as revision 25618 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-31 22:48:44 +00:00
Ramiro Polla
0d0778b060 ffmpeg: fix opt_codec_tag() return value 
opt_codec_tag() is now used under OPT_FUNC2, which must return a value.

Originally committed as revision 25616 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-31 19:55:13 +00:00
Rocky Cardwell
b67f3d6575 Fix ffserver-related regression (and crash) introduced in r25500. 
Fixes issue 2317.

Patch by Rocky Cardwell, rocky d cardwell a lifespringschool d org

Originally committed as revision 25603 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-29 14:54:18 +00:00
Carl Eugen Hoyos
ec1ca41cef Move new_output_stream() up for upcoming fix for issue 2317. 
Originally committed as revision 25602 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-29 14:48:38 +00:00
Anton Khirnov
63e856df0a ffmpeg.c: dynamically allocate metadata maps 
Originally committed as revision 25599 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-28 20:28:22 +00:00
Stefano Sabatini
d0242e741d Factorize: opt_{audio,video,subtitle}_tag() -> opt_codec_tag(). 
Originally committed as revision 25596 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-28 13:20:26 +00:00
Stefano Sabatini
96ea6ad2a7 Remove unused variables picture_crop_temp and picture_pad_temp. 
Originally committed as revision 25530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-20 09:45:50 +00:00
Nicolas George
4ad08021e8 Add a -force_key_frames option to ffmpeg. 
The option is useful to ensure that there is a seek point exactly at a
place the user will probably want to jump precisely sometime, the
major example would be the end of an opening and the beginning of a
chapter. The scene change detection system will often make it happen,
but not always for example if there is a fade-in.

See the thread:
Subject: [FFmpeg-devel] [PATCH] -force_key_frames option
Date: Tue, 12 Oct 2010 15:16:26 +0200

Patch by Nicolas George -mail nicolas,george,normalesup,org.

Originally committed as revision 25526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-18 21:47:15 +00:00
Stefano Sabatini
ff0652e503 Implement a common get_filtered_video_frame(), shared between ffplay.c 
and ffmpeg.c.

Originally committed as revision 25520 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-18 13:57:11 +00:00
Stefano Sabatini
16b2691346 Make help message for the -crop* options consistent with that of the 
-pad* options and more direct.

Originally committed as revision 25519 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-18 13:43:07 +00:00
Stefano Sabatini
5879ea6d27 Remove -crop* options. 
Users are required to use the libavfilter crop filter.

Originally committed as revision 25518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-18 13:34:46 +00:00
Stefano Sabatini
3f2a7e4277 Cosmetics: use a more compact notation, improve readability and reduce 
line count.

Originally committed as revision 25510 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 20:57:55 +00:00
Stefano Sabatini
dbabc2773a Reset metadata after opt_output_file(), fix the previous commit. 
Spotted by elenril on irc.

Originally committed as revision 25509 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 16:16:01 +00:00
Stefano Sabatini
4bf65e2a4d Use an AVMetadata struct for storing metadata, simplify. 
Originally committed as revision 25508 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 15:25:02 +00:00
Anton Khirnov
a7e5a832c4 ffmpeg.c/ffprobe.c: remove all uses of av_metadata_conv() 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25503 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 13:04:27 +00:00
Stefano Sabatini
2a24df9357 Add avfilter_graph_config(). 
Originally committed as revision 25502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 10:20:53 +00:00
Nicolas George
0b6d358a09 Place the bitstream_filters variable in the AVOutputStream, thus 
greatly simplifying its handling and reducing code duplication.

Patch by Nicolas George -bsf nicolas*george|normalesup+org.

Originally committed as revision 25501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 10:06:13 +00:00
Nicolas George
9fdf4b5817 Move the allocation of the AVOutputStream structure earlier in the 
code flow, in the new_video_stream() / new_audio_stream() /
new_subtitle_stream() functions.

Patch by Nicolas George <$name.$surname@normalesup.org>.

Originally committed as revision 25500 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 10:06:10 +00:00
Stefano Sabatini
f7ead94c69 Factorize definition of the output_filter defined in both ffplay.c and 
ffmpeg.c.
Replace it with a more generic definition which can be shared.

Originally committed as revision 25453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-12 18:40:26 +00:00
Stefano Sabatini
94498ec98a Extend buffer source to accept the time base for the output PTS. 
Originally committed as revision 25451 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-12 18:40:20 +00:00
Alexander Strange
0ff4f0c0fc ffmpeg: Use guess_correct_pts() to set decoded picture timestamps 
Originally committed as revision 25431 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-10 02:17:26 +00:00
Aurelien Jacobs
fd0368e7ca move av_find_stream_info() info struct to AVStream to avoid messy (re)allocation 
Originally committed as revision 25418 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 22:01:19 +00:00
Aurelien Jacobs
ca8064d2d1 fix bitstream filter option mapping when using -newvideo and friends 
There was an off-by-one when addressing bitstream_filters[] in this situation.

Originally committed as revision 25398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:25:48 +00:00
Michael Niedermayer
2dec2bb880 Pass RC parameters on stream copy to the muxer. 
Originally committed as revision 25384 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 01:57:35 +00:00
Aurelien Jacobs
1136850dd5 cosmetic: break long line 
Originally committed as revision 25377 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 18:54:10 +00:00
Aurelien Jacobs
6d3421498e ffmpeg: Fix prototype of some OPT_FUNC2 functions. They must return an int. 
Originally committed as revision 25358 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 21:05:07 +00:00
Aurelien Jacobs
59ac1da26d cosmetic: break long line 
Originally committed as revision 25329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-03 20:23:16 +00:00
Reimar Döffinger
a5c33faacc Add init and uninit functions to cmdutils, reduces code duplication 
between ffmpeg and ffplay and avoids a valgrind error by freeing
avformat_opts->key.

Originally committed as revision 25309 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 08:44:33 +00:00
Aurelien Jacobs
84fd51e5ad ffmpeg: replace MAX_STREAMS by an arbitrary sanity check 
Originally committed as revision 25304 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:56:09 +00:00
Aurelien Jacobs
620a67d56a ffmpeg: dynamically allocate bitstream_filters 
Originally committed as revision 25303 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:54:20 +00:00
Aurelien Jacobs
3a8e882419 ffmpeg: dynamically allocate stream_maps 
Originally committed as revision 25302 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:52:09 +00:00
Aurelien Jacobs
0a6d97b371 ffmpeg: dynamically allocate output_codecs 
Originally committed as revision 25301 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:51:12 +00:00
Aurelien Jacobs
311e223f28 ffmpeg: dynamically allocate input_codecs 
Originally committed as revision 25300 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:41:27 +00:00
Aurelien Jacobs
2c6958aabd ffmpeg: dynamically allocate input_files_ts_scale 
Originally committed as revision 25299 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:36:13 +00:00
Aurelien Jacobs
e640f26177 ffmpeg: dynamically allocate streamid_map 
Originally committed as revision 25298 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:34:59 +00:00
Aurelien Jacobs
dba249abee ffmpeg: add a grow_array() helper function 
Originally committed as revision 25297 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:29:37 +00:00
Måns Rullgård
b64b4134d5 Rename libavutil/assert.h to avassert.h 
This avoids conflicts with the system assert.h.

Originally committed as revision 25284 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 13:55:13 +00:00
Michael Niedermayer
b926b6282d av_assert() system. 
With this the developer can now choose if he wants an assert always enabled or at which
compile time assert level. This can thus replace the #define NDEBUG hacks

Originally committed as revision 25278 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-30 21:57:31 +00:00
Michael Niedermayer
0093ebc20a User application side of Codec specific parameters. 
Originally committed as revision 25266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-29 23:06:51 +00:00
Janne Grunau
d04247a134 use strict_std_complience from avcodec_opts[AVMEDIA_TYPE_*] 
Options are not yet set for video encoders and for codec specific
defaults it is desireable to set the codec options only after the codec
is known.

Originally committed as revision 25230 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-27 19:59:36 +00:00
Stefano Sabatini
2bc05d3547 Change the syntax of the crop filter from x:y:w:h to w:h:x:y. 
Slightly more intuitive and required by a pending changes for making
the filter parametric.

Originally committed as revision 25184 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-24 23:14:01 +00:00
Michael Niedermayer
3f07e8dbee Doxy consistency cosmetics 
Originally committed as revision 25176 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-24 15:40:53 +00:00
Michael Niedermayer
6b6bca6443 Enable AV_LOG_SKIP_REPEATED to maintain previous behavior. 
Originally committed as revision 25175 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-24 15:39:10 +00:00
Stefano Sabatini
e44c01563f Deprecate av_opt_show() in favor of a new function av_opt_show2(), 
which allows to specify only a subset of all the options to show.

Originally committed as revision 25166 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-24 00:51:40 +00:00
Stefano Sabatini
1790d3b330 Move log_callback_help to cmdutils.[hc], for allowing sharing. 
Originally committed as revision 25149 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-20 21:48:03 +00:00
Justin Ruggles
ff19d16b91 10l: error in last commit. use decoder channels not encoder channels. 
Originally committed as revision 25144 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-18 20:19:18 +00:00
Justin Ruggles
37f5a713de Change remaining ost->st->codec and ist->st->codec to enc and dec in 
do_audio_out().

Originally committed as revision 25143 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-18 20:16:56 +00:00
Martin Storsjö
2dfa7c72ce Update the audio sample rate when doing lowres audio decoding, before opening the decoder 
Originally committed as revision 25090 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-09 20:58:13 +00:00
Stefano Sabatini
37b9706123 Factorize opt_new_{audio,video,subtitle} definitions. 
Originally committed as revision 24905 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 15:48:20 +00:00
Stefano Sabatini
dfd5775735 Cosmetics: rename out_video_filter to output_video_filter, for 
consistency with input_video_filter.

Originally committed as revision 24904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 15:48:17 +00:00
Stefano Sabatini
4ddf0d2915 Make configure_filters() return a meaningful error code rather than 
always -1.

Originally committed as revision 24903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 15:48:11 +00:00
Ramiro Polla
3f1710e74f indent 
Originally committed as revision 24894 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 00:46:32 +00:00
Vitor Sessak
c4ab519e00 Make "-fs ss" mean "make output file of size equals or less than ss" 
instead of current "make output file of size less than ss".

Also use it to make MP3 tests more readable (using -fs xxx where xxx is
the requested output size, not something slightly lower).

Originally committed as revision 24884 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-23 14:46:59 +00:00
Stefano Sabatini
84c0386960 Change avfilter_open() signature, from: 
AVFilterContext *avfilter_open(AVFilter *filter, const char *inst_name);
to:
int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name);

This way it is possible to propagate an error code telling the reason
of the failure.

Originally committed as revision 24765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 11:44:51 +00:00
S.N. Hemanth Meenakshisundaram
cc80caff52 Separate video specific BufferRef properties into VideoProps. 
Define a new struct AVFilterBufferRefVideoProps and add a type field
to AVFilterBufferRef.

Video specific properties in AVFilterBufferRefVideoProps are now
referred to by *video pointer in AVFilterBufferRef.

Patch by S.N. Hemanth Meenakshisundaram smeenaks->ucsd.edu.

Originally committed as revision 24763 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 11:06:04 +00:00
S.N. Hemanth Meenakshisundaram
5d4890d73d Rename fields: 
AVFilterLink.srcpic    ->  AVFilterLink.src_buf
AVFilterLink.cur_pic   ->  AVFilterLink.cur_buf
AVFilterLink.outpic    ->  AVFilterLink.out_buf

The new names are more generic and more consistent, since the struct
they contain, which was named AVFilterPicRef, has been renamed to
AVFilterBufferRef.

Patch by S.N. Hemanth Meenakshisundaram %smeenaks%ucsd%edu%.

Originally committed as revision 24732 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-07 01:15:34 +00:00
S.N. Hemanth Meenakshisundaram
7fce481a69 Rename functions and fields: 
avfilter_(un)ref_pic       -> avfilter_(un)ref_buffer
avfilter_copy_picref_props -> avfilter_copy_buffer_ref_props
AVFilterBufferRef.pic      -> AVFilterBufferRef.buffer

They have been renamed to allow sharing with audio.

Patch by S.N. Hemanth Meenakshisundaram $smeenaks$ucsd$edu$.

Originally committed as revision 24731 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-07 01:15:27 +00:00
S.N. Hemanth Meenakshisundaram
ecc8dada37 Rename AVFilterPicRef to AVFilterBufferRef. 
The struct is going to be used for storing audio buffer references as
well, and the new name is more generic.

Patch by S.N. Hemanth Meenakshisundaram @smeenaks@ucsd@edu@.

Originally committed as revision 24730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-07 01:15:19 +00:00
Stefano Sabatini
126b638ea0 Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate() 
in favor of the newly added corresponding functions
av_parse_video_size() and av_parse_video_rate() defined in
libavcore/parseutils.h.

This change also adds a linking-time dependency of libavcodec and of
libavfilter on libavcore.

Originally committed as revision 24518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-26 23:12:28 +00:00
Stefano Sabatini
065a20cb07 Reindent. 
Originally committed as revision 24506 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-26 13:39:49 +00:00
Stefano Sabatini
3aace1bcac Rename av_transcode() to transcode(). 
av_ prefix is reserved for libav* libraries functions, it is confusing
to use it for an application function.

Originally committed as revision 24505 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-26 13:39:41 +00:00
Stefano Sabatini
639e4ec81b Rename av_exit() to ffmpeg_exit(). 
av_ is a prefix reserved for av* libraries functions, using that for an
application function is confusing.

Originally committed as revision 24497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 14:42:32 +00:00
Stefano Sabatini
f62c025a5e Use X ? Y : Z construct, simplify. 
Originally committed as revision 24496 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 14:41:06 +00:00
Stefano Sabatini
f7bd4a8ebd Cosmetics: rename enc -> dec in opt_input_file(). 
The variable refer to a *decoder* context, the old name was
misleading.

Originally committed as revision 24492 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 10:42:00 +00:00
Jai Menon
d62ccec8b1 FFmpeg : Replace some av_exit calls in av_transcode with branches to the 
cleanup code.

This plugs a bunch of memleaks.

Originally committed as revision 24305 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-18 18:20:41 +00:00
Jai Menon
961e4a3389 FFmpeg : Close input file and free any related memory if 
av_find_stream_info fails.

Originally committed as revision 24247 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-15 11:53:34 +00:00
Michael Niedermayer
748db0fcc4 Move frame_available computation to where it belongs in ffmpeg.c. 
This fixes a infinite loop.
Fixes issue 2066.

Originally committed as revision 24058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-05 14:49:48 +00:00
Stefano Sabatini
9f434b6584 Make opt_pad() print more information. 
Originally committed as revision 24050 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-04 20:59:02 +00:00
Stefano Sabatini
74dc99f2b3 Update help message for the -pad* options, as they have been removed, 
and update the manual page accordingly.

Based on a patch by John Calcote $(echo "<kpio.dbmdpuf@hnbjm.dpn>" | tr "b-za" "a-z").

Originally committed as revision 24049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-04 20:59:00 +00:00
Baptiste Coudurier
3c5e1b36d5 LOL, 100l, really fix warning: 
ffmpeg.c: In function 'new_audio_stream':
ffmpeg.c:665: warning: 'best' may be used uninitialized in this function
ffmpeg.c:665: note: 'best' was declared here

Originally committed as revision 24034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 23:24:37 +00:00
Baptiste Coudurier
947cbeca16 Fix warning: 
ffmpeg.c: In function 'new_audio_stream':
ffmpeg.c:665: warning: 'best' may be used uninitialized in this function
ffmpeg.c:665: note: 'best' was declared here

Originally committed as revision 24033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 23:22:25 +00:00
Rodney Baker
2d525ef483 Change all occurences of "inofficial" to "unofficial" in code, comments 
and options. Keep old options until next major version bump.

Patch by Rodney Baker, rodney d baker a iinet d net d au

Originally committed as revision 24021 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 15:35:23 +00:00
Baptiste Coudurier
8abcbf2d54 Reduce codec time base when stream copying 
Originally committed as revision 24019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 10:12:22 +00:00
Baptiste Coudurier
f96363df7a Set graph swscale opts before parsing it, that way opts are available 
when auto-adding scalers.

Originally committed as revision 24015 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 03:11:04 +00:00
Stefano Sabatini
2b4abbd6f5 Move colorspace.h from libavcodec to libavutil. 
Avoid a compile-time dependency of the pad filter on libavcodec.

Originally committed as revision 23940 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-01 18:49:44 +00:00
Mike Scheutzow
006e8108de Add new option "streamid" to set the value of an outfile streamid. 
Patch by Mike Scheutzow, scheutzow alcatel-lucent com

Originally committed as revision 23917 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 22:35:57 +00:00
Måns Rullgård
2829ce4b40 Remove PPC perf counter support 
This functionality is better accessed through tools like oprofile.

Originally committed as revision 23808 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-26 22:23:35 +00:00
Stefano Sabatini
25d3445811 Rename rec_timestamp to recording_timestamp, for consistency with 
recording_time.

Originally committed as revision 23727 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-22 22:54:39 +00:00
Alexander Strange
28db32159e ffmpeg: cosmetics: combine two variable declarations 
Originally committed as revision 23677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-21 04:15:18 +00:00
Michael Niedermayer
54a13282bd Deprecate -crop* arguments, they currently are buggy (issue1957) and probably 
will be fixed by removing them.

Originally committed as revision 23607 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-14 17:35:46 +00:00
Justin Ruggles
e91376d1f6 10l: audio_buf is already a uint8_t* so no need to cast it 
Originally committed as revision 23571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-10 19:50:14 +00:00
Justin Ruggles
79c85beba8 Allocate enough memory for audio_buf to fit a full output frame. 
Also, use audio_buf when encoding the final frame.
Fixes Issue 1921.

Originally committed as revision 23570 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-10 19:40:56 +00:00
Diego Biurrun
a1629e2848 Remove support for pre-Haiku, non-POSIX, non-C99 BeOS variants. 
BeOS support has been broken for many years and the "maintainer" of the port
has not reacted to countless requests to get the port fixed.
approved by Mans

Originally committed as revision 23562 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-10 16:51:14 +00:00
Luca Abeni
b659c8b4b7 In case of stream copy, copy the extradata from the input codec context to 
the output codec context (instead of just copying a pointer to the extradata).

Originally committed as revision 23538 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-08 19:27:29 +00:00
Stefano Sabatini
83a36b2e0b Change type of {audio,video,subtitle}_codec_tag variables from int to 
unsigned int, as the corresponding variable set in
AVCodecContext.codec_tag is unsigned int.

Originally committed as revision 23441 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-03 18:40:31 +00:00
Janne Grunau
770e50ae80 ffmpeg: offer alternatives for experimental codecs if they exist 
Originally committed as revision 23398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-31 22:35:14 +00:00
Janne Grunau
4e605bc3fd ffmpeg: fail if user selected codec is experimental and strict_std_compliance > experimental 
Originally committed as revision 23397 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-31 22:31:51 +00:00
Ramiro Polla
c56e9e05ab 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
happens at the end of the buffer, and there was one byte less read per line,
this caused the remaining space on the buffer to contain random data.

Originally committed as revision 23251 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-22 21:32:57 +00:00
Baptiste Coudurier
521cfa4aae rename -vfilters cli option to -vf 
Originally committed as revision 23100 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-12 01:47:14 +00:00
Baptiste Coudurier
d21f58b52d cosmetics, rename loop to frame_available 
Originally committed as revision 23092 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 17:25:18 +00:00
Baptiste Coudurier
a9f3cb9372 rename curr_filter to last_filter, factorize filter declaration 
Originally committed as revision 23091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 17:23:06 +00:00
Baptiste Coudurier
79b90b2549 cosmetics: indentation, whitespaces 
Originally committed as revision 23090 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 17:18:13 +00:00
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