Commit Graph

692 Commits

Author SHA1 Message Date
Baptiste Coudurier
f2abc55945 add -xerror option, ffmpeg will now exit right when an error occurs
Originally committed as revision 15210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:23:44 +00:00
Baptiste Coudurier
6b682df233 print error when deinterlacing fails
Originally committed as revision 15201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 21:48:46 +00:00
Peter Ross
287ba997b5 Remove further 1sample=2byte assumptions within FFmpeg to allow
F32LE/F64BE/F64LE audio to be encoded properly.

Originally committed as revision 15192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 10:18:04 +00:00
Peter Ross
f031938343 Display error message when user attempts to resample non-S16 audio formats.
Patch supplied by Daniel Serpell <daniel dot serpell at gmail dotcom>.

Originally committed as revision 15119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:23:48 +00:00
Stefano Sabatini
de427ff48b Simplify the indexing logic in the av_encode() streams mapping code.
Originally committed as revision 14992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 18:50:46 +00:00
Aurelien Jacobs
c30a4489b4 export sample_aspect_ratio read by the demuxer in a separate field
that the one read by the decoder.

Originally committed as revision 14932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 23:13:58 +00:00
Stefano Sabatini
2fc3866d5e Provide a context to opt_frame_rate(), and make it print the wrong
value in case of error. Improve error reporting and consistency with
the other opt_* functions.

Originally committed as revision 14914 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 12:07:48 +00:00
Stefano Sabatini
745b39d5f9 Replace invocations of av_fifo_realloc(), which is going to be
deprecated, with corresponding invocations of av_fifo_realloc2().

Originally committed as revision 14848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 18:49:57 +00:00
Aurelien Jacobs
7246177d80 ensure we get explicit definition of various _XOPEN_SOURCE functions we use
Originally committed as revision 14766 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 22:01:59 +00:00
Loren Merritt
81b060faf9 align the audio decoding buffer, since some codecs write to it with simd
Originally committed as revision 14707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 05:59:12 +00:00
Stefano Sabatini
f44fd37447 Increase the maximum number of supported stream mappings in ffmpeg.c.
The new value is given by maximum_files_nb * maximum_streams_per_file_nb,
which looks also more correct in respect to the previous value.

Originally committed as revision 14520 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03 13:38:31 +00:00
Peter Ross
a79db0f7c4 Add sample format converter to FFmpeg (adds -sample_fmt option)
Originally committed as revision 14512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03 00:37:07 +00:00
Peter Ross
ce1ee094d7 Add opt handler for pending "-sample_fmt" option
Originally committed as revision 14486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 13:11:07 +00:00
Stefano Sabatini
150d5a259b Make ffmpeg dump output format in case of codec type mismatch between
an input stream and the corresponding output stream.

Originally committed as revision 14462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 21:54:12 +00:00
Peter Ross
aa29709ec8 add CODEC_ID_PCM_F32BE (32-bit floating point PCM big endian decoder)
Originally committed as revision 14409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-26 07:08:15 +00:00
Diego Biurrun
e16190fa7a cosmetics: typo fixes
Originally committed as revision 14376 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 21:12:37 +00:00
Michael Niedermayer
0042808e31 Remove explicit strict_std_compliance support as it seems to work fine over
AVOptions, actually it works even finer as it also gets passed to the
decoder.

Originally committed as revision 14307 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 16:01:46 +00:00
Stefano Sabatini
fc7ad2af05 Make ffmpeg -t X with X<=0 transcode nothing.
Originally committed as revision 14285 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-18 22:23:29 +00:00
Michael Niedermayer
44eb047a5b Correcting displayed muxing overhead and video stream size.
Partially fixes issue348.

Originally committed as revision 14282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-18 13:52:23 +00:00
Michael Niedermayer
8833f375f9 -itsscale to scale timestamps
fixes issue511

Originally committed as revision 14226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 22:55:52 +00:00
Diego Biurrun
89129c6b1d Drop non-C99-compliant initialization.
Originally committed as revision 14224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 21:59:58 +00:00
Michael Niedermayer
bd6754aa79 On EOF keep calling the decoders until they do not output anything
anymore, instead of just once.

Originally committed as revision 14220 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 21:39:18 +00:00
Michael Niedermayer
8858816d4c Use -vsync 0 unless the user explicitly asked for something
else when the framerate is above 1000.
Fixes issue259.

Originally committed as revision 14208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 16:19:23 +00:00
Ramiro Polla
d08e3e91af Prevent users from setting -vol and -acodec copy together.
They are incompatible since the frames are not decoded, so they can't be preprocessed.

Originally committed as revision 14178 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 11:43:21 +00:00
Michael Niedermayer
4e999ebe03 indent
Originally committed as revision 14137 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-09 06:57:19 +00:00
Michael Niedermayer
385b19dfd4 Allow setting codecs through preset files
Originally committed as revision 14136 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-09 06:56:26 +00:00
Michael Niedermayer
8dbee6538d Fix the av_set_string() free / alloc issue.
Originally committed as revision 14134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 23:50:03 +00:00
Michael Niedermayer
b86f5a02ea Register intrrupt_cb() early enough so we dont get stuck with tcp input
for example.
Fixes issue66

Originally committed as revision 13992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 20:50:15 +00:00
Stefano Sabatini
9010d54390 Remove unnecessary function opt_qdiff(), max_qdiff is set now through
the AVOption system. Also removes the previous constraints when
setting max_qdiff through opt_qdiff() (1 <= max_qdiff <= 31).

Originally committed as revision 13981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 21:48:51 +00:00
Michael Niedermayer
181782ae46 Use correct timestamp value for stream copy.
Originally committed as revision 13963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 13:46:06 +00:00
Stefano Sabatini
9c09099e75 Cosmetics: move ffmpeg.c dframes option definition from within the
video options to the generic options where it belongs.

Originally committed as revision 13893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 16:20:12 +00:00
Baptiste Coudurier
d2ce2f5e5c cosmetics, reindent
Originally committed as revision 13869 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 01:36:15 +00:00
Baptiste Coudurier
dbedf2aae2 enable feeder threads
Originally committed as revision 13868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 01:35:43 +00:00
Stefano Sabatini
88643f396a Cosmetics: display ffmpeg -h generic advanced options just after
generic non-advanced options.

Originally committed as revision 13794 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-17 10:11:46 +00:00
Stefano Sabatini
ef3efa0dbc Don't show advanced subtitle options within the ffmpeg -h generic
advanced options.

Originally committed as revision 13779 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-16 13:02:22 +00:00
Stefano Sabatini
fb74bc4361 Don't show subtitle and grab options within the ffmpeg -h generic options.
Originally committed as revision 13778 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-16 10:00:32 +00:00
Stefano Sabatini
d58ddafdbc Make ffmpeg.c use print_error() when it can't read an ffserver stream.
Originally committed as revision 13761 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 22:30:01 +00:00
Stefano Sabatini
462cca10cf Improve ffmpeg error reporting in case of input/output stream mismatch,
enabling a dump_format() of the mismatched output stream.

Originally committed as revision 13760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 22:07:17 +00:00
Stefano Sabatini
d18811bbf5 Make ffmpeg.c:opt_thread use parse_number_or_die().
Originally committed as revision 13758 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 21:21:28 +00:00
Stefano Sabatini
3022cd10a5 Factorize options context setting.
Patch by Stefano Sabatini stefano sabatini-lala posteit

Originally committed as revision 13756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 11:28:49 +00:00
Baptiste Coudurier
837d248df6 enable stream copy with ffserver, to be able to chain
Originally committed as revision 13753 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 01:43:52 +00:00
Baptiste Coudurier
6dfafe109d set log debug when avformat debug is set
Originally committed as revision 13750 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 23:45:00 +00:00
Baptiste Coudurier
3438d82d4b remove ugly ffm_nopts hack, use AVFormatContext->timestamp
Originally committed as revision 13718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 00:24:29 +00:00
Michael Niedermayer
e66ace6f0b Support longer paths for and longer names in preset files.
Originally committed as revision 13710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-08 10:52:41 +00:00
Michael Niedermayer
439c18c75d indent
Originally committed as revision 13709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-08 10:48:52 +00:00
Michael Niedermayer
23b20b5cf3 Search /usr(/local)/share for preset files as well.
This also fixed a null pointer dereference if HOME isnt set.

Originally committed as revision 13708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-08 10:48:23 +00:00
Michael Niedermayer
d9f1b68cf5 Presets support.
How per codec defaults and ranges will be supported is still being discussed.

Originally committed as revision 13685 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 09:12:42 +00:00
Stefano Sabatini
e992fba4ba Add a few newlines to 'ffmpeg -h' output to make it more readable.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-31 18:36:44 +00:00
Peter Ross
418a0b9fc4 Compiling ffmpeg.c fails when when the .ffm demuxer is enabled, but the .ffm
muxer is disabled. The cause is an incorrect #ifdef that assumes that the
ffm_nopts symbol (global define in ffmenc) is present when either ffm muxer
OR demuxer is enabled.
patch by Peter Ross, pross xvid org

Originally committed as revision 13573 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-31 14:22:30 +00:00
Michael Niedermayer
573e8cb309 Remove incorrect usage of av_free_static(), ffmpeg.c is not a
windows dll which can be unloaded and loaded again.

Originally committed as revision 13565 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-30 20:30:29 +00:00