virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
29,866 Commits 39 Branches 425 Tags
e955a682e125d44143415ff2b96a99a4dac78da2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Khirnov e955a682e1 AVOptions: fix av_set_string3() doxy to match reality. 
Fixes bug 28.
 2011-09-03 21:00:52 +02:00
Anton Khirnov 20c21f8b75 cmdutils: get rid of dummy contexts for examining AVOptions. 
Replace it with newly introduced libavutil API.
 2011-09-03 20:58:15 +02:00
Anton Khirnov fb4ca26bdb lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions. 2011-09-03 20:53:35 +02:00
Anton Khirnov c11fb8288d AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find(). 
It allows to search for options only with AVClass, without allocating
the corresponding context.
 2011-09-03 20:52:21 +02:00
Anton Khirnov 9bc9188e58 libmp3lame: fix typo 
FF_API_LAME_GLOBAL_OPTIONS => FF_API_LAME_GLOBAL_OPTS

Thanks to Clément Bœsch for spotting.
 2011-09-01 10:37:19 +02:00
Anton Khirnov bea5670a4f AVOptions: drop av_ prefix from static av_get_number(). 2011-09-01 10:37:04 +02:00
Anton Khirnov 1440037411 libx264: use X264_THREADS_AUTO constant instead of 0. 2011-09-01 10:12:30 +02:00
Anton Khirnov 5d06f15235 libx264: set default thread count to 0 (auto) 2011-08-31 17:39:13 +02:00
Anton Khirnov f013cb8118 lavc: cosmetics, group deprecated codec flags 2011-08-31 13:28:54 +02:00
Anton Khirnov aed7900704 mpeg12: add 'scan_offset' private option. 
Deprecate CODEC_FLAG_SVCD_SCAN_OFFSET
 2011-08-31 13:28:41 +02:00
Anton Khirnov 4bcee8e7f8 h263/p encoder: add 'structured_slices' private option. 
Deprecate CODEC_FLAG_H263P_SLICE_STRUCT
 2011-08-31 13:28:26 +02:00
Anton Khirnov 0d904de89d h263/p encoder: add 'obmc' private option. 
Deprecate CODEC_FLAG_OBMC
 2011-08-31 13:28:11 +02:00
Anton Khirnov e3922d1110 h263p encoder: add 'aiv' private option. 
Deprecate CODEC_FLAG_H263P_AIV
 2011-08-31 13:27:59 +02:00
Anton Khirnov 9bb2d1a3f0 h263p encoder: add 'umv' private option. 
Deprecate CODEC_FLAG_H263P_UMV
 2011-08-31 13:27:36 +02:00
Anton Khirnov 0e5d37309f mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option. 
Deprecate CODEC_FLAG_ALT_SCAN
 2011-08-31 13:26:26 +02:00
Anton Khirnov 1f0c7020a1 mjpegdec: add 'extern_huff' private option. 
Deprecate CODEC_FLAG_EXTERN_HUFF
 2011-08-31 13:25:54 +02:00
Anton Khirnov 4623420d84 mpeg4enc: add 'data_partitioning' private option. 
Deprecate CODEC_FLAG_PART
 2011-08-31 13:25:18 +02:00
Anton Khirnov 0cc06b9e23 snow: add 'memc_only' private option. 
Deprecate CODEC_FLAG2_MEMC_ONLY
 2011-08-31 13:24:16 +02:00
Anton Khirnov 0dc5e12f1e libx264: add 'mbtree' private option. 
Deprecate CODEC_FLAG2_MBTREE
 2011-08-31 13:24:02 +02:00
Anton Khirnov 38934f19fe libx264: add 'psy' private option. 
Deprecate CODEC_FLAG2_PSY
 2011-08-31 13:23:37 +02:00
Anton Khirnov a7cec3a094 libmp3lame: add 'reservoir' private option. 
Deprecate CODEC_FLAG2_BIT_RESERVOIR
 2011-08-31 13:22:53 +02:00
Anton Khirnov 88262ca87d mpeg2enc: add 'non_linear_quant' private option 
Deprecate CODEC_FLAG2_NON_LINEAR_QUANT
 2011-08-31 13:21:59 +02:00
Anton Khirnov 2c5e1efc09 mpeg12enc: add drop_frame_timecode private option. 
Deprecate CODEC_FLAG2_DROP_FRAME_TIMECODE
 2011-08-31 13:21:05 +02:00
Anton Khirnov 297d9cb3dc mpeg12enc: add intra_vlc private option. 
Deprecate CODEC_FLAG2_INTRA_VLC.
 2011-08-31 13:19:14 +02:00
Anton Khirnov 7485e54708 lavc: deprecate CODEC_FLAG2_BRDO 
It's been unused for the last 3 years.
 2011-08-31 10:26:21 +02:00
Anton Khirnov cf90c5d0e0 libx264: add 'aud' private option. 
Deprecate CODEC_FLAG2_AUD.
 2011-08-31 10:26:11 +02:00
Anton Khirnov 3b82aeeec0 libx264: add 'fast-pskip' private option. 
Deprecate CODEC_FLAG2_FASTPSKIP.
 2011-08-31 10:25:54 +02:00
Anton Khirnov 373257fa79 libx264: add '8x8dct' private option. 
Deprecate CODEC_FLAG2_8X8DCT.
 2011-08-31 10:25:34 +02:00
Anton Khirnov eab21c32e3 libx264: add 'mixed-refs' private option. 
Deprecate CODEC_FLAG2_MIXED_REFS.
 2011-08-31 10:25:06 +02:00
Anton Khirnov 0f29699db7 libx264: add 'weightb' private option. 
Deprecate CODEC_FLAG2_BPYRAMID.
 2011-08-31 10:24:56 +02:00
Anton Khirnov 34dda1251d libx264: add 'b-pyramid' private option. 
Deprecate CODEC_FLAG2_BPYRAMID.
 2011-08-31 10:24:17 +02:00
Anton Khirnov 5d4a1048ee libx264: add 'intra-refresh' private option. 
Deprecate CODEC_FLAG2_INTRA_REFRESH.
 2011-08-31 10:23:26 +02:00
Anton Khirnov faaecd4708 libx264: add 'ssim' private option. 
Deprecate CODEC_FLAG2_SSIM.
 2011-08-31 10:23:03 +02:00
Anton Khirnov 3b81636f33 libx264: make options compatible with x264 
Replace '_' with '-', merge psy-trellis into psy-rd and rename cqp->qp
Also fix typo pdy-rd -> psy-rd
 2011-08-31 10:21:36 +02:00
Anton Khirnov 2e2594ca5b avconv: remove -threads option. 
It's only shadowing the AVOption with the same name.
 2011-08-30 20:51:32 +02:00
Anton Khirnov c922816d31 avconv: remove stubs of crop* and pad* options 2011-08-29 06:22:10 +02:00
Anton Khirnov ed5b13265e avconv: re-add nb_streams to InputFile. 
It was mistakenly removed in 2cf8355f98,
not taking into account that new streams might appear in av_read_frame()
that avconv doesn't know about.

Fixes bug 24.
 2011-08-29 06:22:07 +02:00
Anton Khirnov 4ae30cac22 libx264: add 'crf_max' private option. 
Deprecate corresponding global option.
 2011-08-24 14:33:40 +02:00
Anton Khirnov c5dd0bc4ca libx264: add 'weightp' private option. 
Deprecate corresponding global option.
 2011-08-24 14:32:24 +02:00
Anton Khirnov d4b9671318 libx264: add 'rc_lookahead' private option. 
Deprecate corresponding global option.
 2011-08-24 14:31:55 +02:00
Anton Khirnov 2a44a8f609 libx264: add 'psy_trellis' private option. 
Deprecate corresponding global option.
 2011-08-24 14:31:07 +02:00
Anton Khirnov 93e623c642 libx264: add 'psy_rd' private option. 
Deprecate corresponding global option.
 2011-08-24 14:30:25 +02:00
Anton Khirnov 5c75b2a0b7 libx264: add 'aq_strength' private option. 
Deprecate corresponding global option.
 2011-08-24 14:30:00 +02:00
Anton Khirnov 85254fcb46 libx264: add 'aq_mode' private option. 
Deprecate corresponding global option.
 2011-08-24 14:28:40 +02:00
Anton Khirnov 9d508e4914 libx264: add 'cqp' private option. 
Deprecate corresponding global option.
 2011-08-24 14:28:07 +02:00
Anton Khirnov d5dc8cc297 libx264: add 'crf' private option. 
Deprecate corresponding global option.

Ideally all x264 private options should be generated automatically, but
x264 doesn't provide the API for this yet.
 2011-08-24 14:26:12 +02:00
Anton Khirnov 8ee18b4bee lavc: remove vbv_delay option 
It's broken and serves no purpose as it's a read-only field.
 2011-08-24 14:07:39 +02:00
Anton Khirnov c74b44de08 avconv: move the avcodec_find_decoder() call to add_input_streams(). 
This makes the code simpler to understand, though it results in an
unnecessary call to avcodec_find_decoder() if the stream won't be
decoded.
 2011-08-23 16:50:01 +02:00
Anton Khirnov ae60927aef libx264: only use ABR mode when the user explicitly set bitrate. 2011-08-22 07:17:39 +02:00
Anton Khirnov 03eff2bf43 libx264: use medium preset by default. 2011-08-22 07:17:38 +02:00
Anton Khirnov 0a593de38a mp2 encoder: make 128k the default bitrate. 2011-08-22 07:17:38 +02:00
Anton Khirnov fb42d156ed movenc: use libx264 by default when possible for mov, mp4 and psp 2011-08-22 07:17:35 +02:00
Anton Khirnov b71389cbae avienc: saner default audio codec. 
libmp3lame if available, ac3 otherwise.
 2011-08-22 07:17:19 +02:00
Anton Khirnov 3436c4a368 matroskaenc: saner default codecs. 
libvorbis/libx264 for video if available, otherwise ac3/mpeg4.
 2011-08-22 07:16:55 +02:00
Anton KhirnovandAlex Converse f5bae2c6ed doc/avconv: replace forgotten av by avconv. 
Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-08-19 15:37:44 -07:00
Anton KhirnovandAlex Converse f60a6b5853 avconv: reset input_ts_offset between files. 
Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-08-19 15:37:14 -07:00
Anton KhirnovandAlex Converse cf4976ed7b doc/avconv: extend -ss documentation. 
Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-08-19 15:36:43 -07:00
Anton KhirnovandAlex Converse b62b5cb6fd avconv: call flush_encoders() from transcode() directly. 
And remove now pointless parameter.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-08-19 15:36:05 -07:00
Anton KhirnovandAlex Converse c093150849 avconv: fix broken indentation. 
Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-08-19 15:35:20 -07:00
Anton KhirnovandAlex Converse f21f294e05 avconv: rescue poor abused limit_filesize global. 
Keep a per-OutputFile instance of it, thus making -fs work with multiple
output files.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-08-19 15:34:24 -07:00
Anton Khirnov 6f1c66d526 avconv: save two levels of indentation in flush_encoders() 
By replacing
if (foo)
    <do stuff>

with
if (!foo)
    continue;
<do stuff>
 2011-08-18 11:22:12 +02:00
Anton Khirnov 4a4ce2e743 avconv: factor flushing encoders out of output_packet(). 2011-08-18 11:22:12 +02:00
Anton Khirnov 630902a1e1 avconv: factor out initializing input streams. 2011-08-18 11:22:12 +02:00
Anton Khirnov ddf5ef0263 avconv: remove -intra option. 
It's equivalent to -g 0.
 2011-08-18 11:22:05 +02:00
Anton Khirnov e922bbfa76 avconv: reset streamid_map between output files. 2011-08-18 08:49:32 +02:00
Anton Khirnov c5ad2c2cc6 avconv: make timer_start a local var in transcode(). 2011-08-18 08:49:32 +02:00
Anton Khirnov 6494c001be avconv: cosmetics, move OutputStream. 
Allows us to get rid of forward InputStream declaration.
 2011-08-18 08:49:32 +02:00
Anton Khirnov e659c51563 avconv: remove two unused macros. 2011-08-18 08:49:32 +02:00
Anton Khirnov 45f861283e avconv: reindent. 2011-08-17 20:01:12 +02:00
Anton Khirnov ea065176b2 avconv: rescue poor abused start_time global. 
Keep a per-OutputFile instance of it, thus making -ss work with multiple
output files.
 2011-08-17 20:00:46 +02:00
Anton Khirnov ef44a60710 avconv: rescue poor abused recording_time global. 
Keep a per-OutputFile instance of it, thus making -t work with multiple
output files.
 2011-08-17 20:00:06 +02:00
Anton Khirnov 2886aee73f avconv: merge two loops in output_packet(). 2011-08-17 19:58:55 +02:00
Anton Khirnov f1176d41af avconv: fix broken indentation. 2011-08-17 19:58:31 +02:00
Anton Khirnov b0c9e8e024 avconv: get rid of the arbitrary MAX_FILES limit. 2011-08-17 19:58:16 +02:00
Anton Khirnov 4288e0316a avconv: get rid of the output_streams_for_file vs. ost_table schizophrenia 
Instead store output streams in the same way as input streams.
 2011-08-17 19:57:20 +02:00
Anton Khirnov af70aa4526 avconv: add a wrapper for output AVFormatContexts and merge output_opts into it 2011-08-17 19:55:55 +02:00
Anton Khirnov 09af7fb309 avconv: make itsscale syntax consistent with other options. 
Move the stream specifier to the option name.
 2011-08-17 19:53:05 +02:00
Anton Khirnov 88867844c6 avconv: factor out adding input streams. 2011-08-17 19:52:28 +02:00
Anton Khirnov 6cd9d0f77d Revert "avconv: use stream copy by default when possible." 
This reverts commit 4f4f33844a.

This commit has some ugly corner cases and needs to be discussed
further.
 2011-08-16 20:59:14 +02:00
Anton Khirnov ad42126abc avconv: print stream copy information. 2011-08-16 20:24:20 +02:00
Anton Khirnov 4f4f33844a avconv: use stream copy by default when possible. 2011-08-16 20:24:20 +02:00
Anton Khirnov a3f2f766af matroskaenc: vertical alignment. 2011-08-16 20:24:20 +02:00
Anton Khirnov 15c14ce6b2 matroskaenc: implement query_codec() 2011-08-16 20:24:20 +02:00
Anton Khirnov 48f9e457ea lavf: add avformat_query_codec(). 
It allows to check if a given codec can be written into a container.
 2011-08-16 20:24:20 +02:00
Anton Khirnov bca06e77e1 lavc: add avcodec_get_type() for mapping codec_id -> type. 2011-08-16 20:24:20 +02:00
Anton Khirnov 5759cce70d avconv: don't segfault on 0 input files. 2011-08-16 20:24:20 +02:00
Anton Khirnov eb97dbb05a movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings 2011-08-16 10:34:17 +02:00
Anton Khirnov 2c81d5f4c5 avconv: remove a write-only variable 2011-08-16 06:24:01 +02:00
Anton Khirnov 40fc281087 avconv: remove pointless parameter from new_*_stream(). 
New streams are always added to the last output file.
 2011-08-16 06:23:46 +02:00
Anton Khirnov 169f0647b7 avconv: cosmetics, move code 
Move find_codec_or_die(), choose_codec(), new_output_stream() and
read_avserver_streams() below transcode() where they belong.
 2011-08-16 06:23:27 +02:00
Anton Khirnov 86530f418e avconv: cosmetics -- move copy_chapters(). 
It's only used in opt_output_file(), so move it right above
opt_output_file().
 2011-08-16 06:21:32 +02:00
Anton Khirnov f233cfed7b avconv: cosmetics -- move parse_forced_key_frames(). 
parse_forced_key_frames() is only used in new_video_stream(), so move it
right above new_video_stream().
 2011-08-16 06:21:25 +02:00
Anton Khirnov 64db1a82d6 lavc: add audio flag to the 'b' option, deprecate 'ab'. 
Its only reason for its existence was ffmpeg's inability to properly assign
AVOptions to streams. Now this is not a problem anymore, so 'ab' should
go.
 2011-08-16 06:20:43 +02:00
Anton Khirnov f4ad238c6c avconv: rename sameq to same_quant 
It's often mistakenly used as 'same quality', emphasize that it's not
true in the manual.
 2011-08-16 06:19:08 +02:00
Anton Khirnov 7478ab5a13 doc/avconv: add forgotten end of chapter. 2011-08-16 06:18:59 +02:00
Anton Khirnov 320d769389 Changelog: document avconv incompatibilities with ffmpeg. 2011-08-16 06:18:38 +02:00
Anton Khirnov 92f1940e99 avconv: replace -vcodec/-acodec/-scodec with a better system. 
The new option doesn't depend on its placement wrt -new* options (which
don't exist anymore) and works in a similar way as per-stream AVOptions.

-[vas]codec remain as aliases to -codec:[vas]
 2011-08-16 06:17:02 +02:00
Anton Khirnov ff884c79ee avconv: remove presets. 
Nothing except x264 uses them and native x264 presets should be used
with private options.
 2011-08-16 06:10:20 +02:00
Anton Khirnov c14fe6bc99 lavf,lavd: remove all usage of AVFormatParameters from demuxers. 
AVFormatParameters are converted into corresponding private options in
av_open_input_file/stream() compat wrappers, so accessing them from
demuxers is redundant.
 2011-08-15 19:59:48 +02:00
Anton Khirnov a7c93dae55 jack: add 'channels' private option. 
Get rid of AVFormatParameters usage.
 2011-08-15 19:56:55 +02:00