1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

701 Commits

Author SHA1 Message Date
Diego Biurrun
d0feff2a5b Uniformly define _XOPEN_SOURCE to 600.
The feature_tests.h header from Sun systems (Solaris/OpenSolaris) will abort
the build if _XOPEN_SOURCE is defined to 500, and C99 is requested (as well
as POSIX.1-2001), and will only accept it to be defined to 600.
inspired by a patch from Diego Pettenò, flameeyes gmail com

Originally committed as revision 15460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-29 06:22:12 +00:00
Diego Biurrun
c44c4e181f cosmetics: Consistently use #ifdef in preprocessor directives.
Originally committed as revision 15459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-29 06:15:51 +00:00
Wolfram Gloger
143df82789 set video_enc->sample_aspect_ratio to fix stream copy
patch by Wolfram Gloger  wmglo _at_ dent.med.uni-muenchen _dot_ de

Originally committed as revision 15457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-28 23:24:32 +00:00
Michael Niedermayer
85663ef302 Move opt_default() and set_context_opts() to cmdutils so it can be used from
the other tools as well.

Originally committed as revision 15450 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-28 19:35:22 +00:00
Stefano Sabatini
d2845b758e Implement the force_fps option, which disables the automatic selection
of the best framerate amongst the list of supported framerates of the
codec. Use the av_find_nearest_q_idx() function to choose the best
framerate.

See the thread: "Implement in lavc a flag which makes avcodec_open()
to choose the best framerate".

Originally committed as revision 15445 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-28 17:34:03 +00:00
Michael Niedermayer
4e72f129c3 Support loading presets from random paths.
Fixes issue659.

Originally committed as revision 15443 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-28 13:09:29 +00:00
Baptiste Coudurier
fb1d2d7be2 include sys/select.h, fix freebsd 5.5 compilation
Originally committed as revision 15421 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 02:13:38 +00:00
Michael Niedermayer
8a4f816a6d Support comments in preset files.
Originally committed as revision 15366 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-18 21:07:11 +00:00
Gert Vervoort
46cd15ca31 Fix setting default value of scan_offset option for target svcd.
Patch by Gert Vervoort gert D vervoort A hccnet D nl

Originally committed as revision 15310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-13 17:25:38 +00:00
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