virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
26,505 Commits 37 Branches 400 Tags 464 MiB
d370e3e931
Commit Graph

1008 Commits

Author SHA1 Message Date
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