virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
22,106 Commits 37 Branches 400 Tags 458 MiB
798339fb46
Commit Graph

852 Commits

Author SHA1 Message Date
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
Aurelien Jacobs
37d3e0667a uses FF_ARRAY_ELEMS() where appropriate 
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-21 21:40:24 +00:00
Stefano Sabatini
70899705ee Provide more context to the opt_preset() error messages, printing the 
name of the preset file where the error occurred.

Originally committed as revision 15637 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-18 18:42:20 +00:00
Stefano Sabatini
b73533176b Make ffmpeg abort if a preset file contains an invalid option or 
argument.

Originally committed as revision 15636 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-18 18:27:32 +00:00
Stefano Sabatini
9ac1c884a0 Provide more context for the error message issued when no preset file 
is found.

Originally committed as revision 15635 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-18 18:18:52 +00:00
Ramiro Polla
3ddb448d0a Support absolute DOS paths for preset parameters 
Originally committed as revision 15624 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-15 14:12:59 +00:00
Stefano Sabatini
a57bf69758 Add preset options documentation strings. 
Originally committed as revision 15605 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-12 20:46:30 +00:00
Michael Niedermayer
965530e156 Limit discontinuity handling to containers that allow discontinuities. 
Originally committed as revision 15590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-09 18:28:43 +00:00
Aurelien Jacobs
fd2b356a62 cosmetics: indentation 
Originally committed as revision 15588 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-08 17:28:49 +00:00
Aurelien Jacobs
6488cf9b09 lookup AVCodec by name 
Originally committed as revision 15587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-08 17:27:45 +00:00
Stefano Sabatini
0093396cff Remove unused and invalid code from ffmpeg.c. 
Originally committed as revision 15567 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-05 17:26:09 +00:00
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
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
Stefano Sabatini
b19221c8ce Make option time parsing functions take argument from options 
Patch by Stefano Sabatini ( stefano sabatini-lala poste it )

Originally committed as revision 12551 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 15:12:04 +00:00
Stefano Sabatini
972d628a8b Provide a context to parse_time_or_die(). 
Patch by Stefano Sabatini: stefano sabatini-lala poste it

Originally committed as revision 12472 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-17 09:33:21 +00:00
Evgeniy Stepanov
90c2295b24 Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing 
of matroska and nut.

Originally committed as revision 12358 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-07 19:25:09 +00:00
Michael Niedermayer
e60da588e3 sws_flags is unsigned. 
This together with the last commit fixes the strange behavior of -sws_flags.
(issue229)

Originally committed as revision 12325 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-05 04:02:04 +00:00
Michael Niedermayer
3948c74f80 Remove INFINITY. 
Originally committed as revision 12288 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-01 23:36:27 +00:00
Stefano Sabatini
53d1bdbaed Clarify the documentation for 'ffmpeg -v'. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 12216 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-25 16:01:53 +00:00
Michael Niedermayer
10e7fc7ce4 Reduce initial fifo size, so as not to senselessly waste memory. 
Originally committed as revision 12186 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-24 01:56:27 +00:00
Michael Niedermayer
a6ebca9e09 realloc fifo 
Originally committed as revision 12185 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-24 01:55:34 +00:00
Stefano Sabatini
b3574faa06 Remove a superfluous call to atoi in ffmpeg.c:opt_verbose 
Patch by Stefano Sabatini ( stefano sabatini-lala poste it )
[FFmpeg-devel] [PATCH] Cosmetics: remove a superfluos call to atoi in
ffmpeg.c:opt_verbose

Originally committed as revision 12136 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-18 15:30:56 +00:00
Michael Niedermayer
5bc440e7e8 Add notes where known timestamp issues remain. 
Originally committed as revision 12135 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-17 21:31:39 +00:00
Michael Niedermayer
48291040ea Set initial next_pts to unknown, this avoids the nonsense timestamp 
discontinuity at the start. I hope this has no sideeffects, if it does
send a bugreport!
fixes issue137

Originally committed as revision 12134 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-17 20:12:44 +00:00
Michael Niedermayer
40cb57a287 Print a warning if a decoder produces more than 1 frame of output for 
a single frame it got from the demuxer+parser.

Originally committed as revision 12133 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-17 19:38:47 +00:00
Michael Niedermayer
ed9238593e Set next_pts to pts if it is unknown and pkt->dts is not known either. This 
is needed because next_pts is used to calculate the next pts and adding
to AV_NOPTS_VALUE does not achieve the intended result.

Originally committed as revision 12132 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-17 19:08:15 +00:00