Commit Graph

665 Commits

Author SHA1 Message Date
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
Baptiste Coudurier
9d58e0a9e1 cosmetics, space before and after parenthesis, weird indentation
Originally committed as revision 13539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 21:26:30 +00:00
Erik Hovland
f094b6627d Remove unnecessary header #includes.
Extracted from a patch by Erik Hovland, erik hovland org.

Originally committed as revision 13531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 13:40:43 +00:00
Stefano Sabatini
ea9c581f61 Simplify show_banner() so that it does not require arguments, similar
to what was previously done with show_version().
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 08:48:51 +00:00
Stefano Sabatini
e5f6b7e5ac Slightly clarify bitstream filter help output.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 11:55:59 +00:00
Michael Niedermayer
e6b4e4ff5f Remove coded_frame==NULL checks for video encoders.
Originally committed as revision 13493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 11:34:26 +00:00
Baptiste Coudurier
1234da4caf use av_fifo_generic_write, old func is deprecated
Originally committed as revision 13455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 01:26:22 +00:00
Michael Niedermayer
bcbd328e17 Make stream copy of ac3 from riff based formats work.
Originally committed as revision 13408 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 00:47:49 +00:00
Michael Niedermayer
fa3b98182d Ensure that one can store X bytes in a fifo of size X.
Fixed issue417.

Originally committed as revision 13405 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 23:04:09 +00:00
Michael Niedermayer
0871ae1a93 Make av_fifo*_read() ignore the available amount of data.
This is more efficient as in practice the check is redundant most of the
time. Callers which do not know if enough data is available have to check
it with av_fifo_size(). Doing the check in *read() means the caller has
no choice to skip the check when its known to be redundant.
Also the return value was never documented in a public header so
changing it should not break the API. Besides this fixes the case where
read() failed on a 100% full fifo.

Originally committed as revision 13404 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 22:20:39 +00:00
Michael Niedermayer
46eab09341 Make opt_verbose() work again.
Originally committed as revision 13403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 20:34:50 +00:00
Stefano Sabatini
ba9880c13a Move show_formats() to cmdutils.c.
Patch by: Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-22 12:55:35 +00:00
Michael Niedermayer
20176cbc73 Get rid of more senseless wrapper functions and use OPT_EXIT instead.
Originally committed as revision 13233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 23:41:17 +00:00
Michael Niedermayer
64555bd9b1 Do not pass program_name as argument to show_version(), this allows some
future simplifications.

Originally committed as revision 13232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 23:36:32 +00:00
Michael Niedermayer
a0b3bcd9fe OPT_EXIT
Originally committed as revision 13231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 23:27:50 +00:00
David Bolt
475f4d8d4b Print timestamp with increased precision.
Patch by David Bolt

Originally committed as revision 13217 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 17:44:51 +00:00
Stefano Sabatini
54d2d4f698 Make 'ffmpeg -formats' print codec long names.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13142 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-13 15:36:10 +00:00
Dave Yeo
0a1b29dea7 sys/resource.h needs sys/types.h on OS/2, patch by Dave Yeo, daveryeo telus net
Originally committed as revision 13116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-11 11:17:23 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory.
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
Ramiro Polla
b091aa44b7 Check for sys/resource.h and include it conditionally.
Originally committed as revision 13075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-08 00:44:42 +00:00
Diego Pettenò
580a6c57a3 Mark symbols as static, patch by Diego 'Flameeyes' Pettenò, flameeyes gmail com
Originally committed as revision 13026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-01 15:12:00 +00:00
Stefano Sabatini
c48da33c63 Send context to some ffmpeg.c opt* function
Patch by Stefano Sabatini ( stefano sabatini-lala poste it )

Originally committed as revision 12927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-22 20:17:30 +00:00
Stefano Sabatini
66824f990b Make some ffmpeg opts use parse-number-or-die.
Patch by Stefano Sabatini stefano sabatini-lala posteit

Originally committed as revision 12919 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-21 08:59:38 +00:00
Ramiro Polla
8767060cd2 Fix bug introduced by r12827.
If av_exit() was called after an AVFormatContext was created, but before
its file was opened, av_exit() would pass a NULL pointer to url_fclose().

Originally committed as revision 12915 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-21 01:22:25 +00:00
Ramiro Polla
296df4e75f Use av_exit() instead of exit() for a minimal cleanup
before leaving ffmpeg.
Needed by some grab devices and possibly network streams.

Originally committed as revision 12827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 22:35:32 +00:00
Ramiro Polla
e5295c0dd9 Move av_exit() so it can be used by more functions
without needing forward declaration.

Originally committed as revision 12826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 22:31:49 +00:00
Stefano Sabatini
6363827e13 Complete argument information in ffmpeg.c:options for non-number arguments
Patch by Stefano Sabatini ( stefano sabatini-lala poste it )

Originally committed as revision 12766 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-08 01:01:00 +00:00
Stefano Sabatini
7542157d8a Export parse_time_or_die from ffmpeg.c to cmdutils.c
Patch by Stefano Sabatini (stefano sabatini-lala poste it)

Originally committed as revision 12647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 10:01:06 +00:00