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,791 Commits 39 Branches 425 Tags
8ee18b4bee24f99e733cf1425894e82c25d02426
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anton Khirnov 8d2e4a7e68 avconv: change semantics of -map 
New syntax contains an optional stream type, allowing to refer to n-th
stream of specific type.

Omitting stream number now maps all streams of the given type.
 2011-08-12 19:10:22 +02:00
Anton Khirnov 3d4f0dab79 avconv: get rid of new* options. 
They are confusing, irregular and redundant -- -map already contains all
the information.  Stream maps can now be parsed in opt_output_file().

Add a more user-friendly default behavior in case no maps are present.

Breaks -programid for now, but it never worked properly anyway. A better
solution will be written soon.
 2011-08-12 19:10:22 +02:00
Anton Khirnov d4863fc1a8 cmdutils: allow precisely specifying a stream for AVOptions. 2011-08-12 18:35:12 +02:00
Anton Khirnov d70e512250 cmdutils: allow ':'-separated modifiers in option names. 2011-08-12 13:51:30 +02:00
Anton Khirnov e6e6060c9b avconv: make -map_metadata work consistently with the other options 
Before, it took an input and output file index, now it only takes an
input file and applies to the next output file.

Stream/chapter/program specification is now part of the option name and
the delimiter was changed from ',' to ':' to be consistent with the
similar feature for AVOptions.
 2011-08-12 13:50:36 +02:00
Anton Khirnov c9065c2917 avconv: remove deprecated options. 2011-08-12 13:30:38 +02:00
Anton Khirnov b9aac90bd8 avconv: make -map_chapters accept only the input file index. 
This is consistent with how all the other options work.
 2011-08-12 13:30:07 +02:00
Anton Khirnov 6291d7e416 Make a copy of ffmpeg under a new name -- avconv. 
It will be further developed with a few incompatible changes.

ffmpeg.c will stay as is for some time, so any scripts using it won't be
broken.
 2011-08-12 13:27:30 +02:00
Anton Khirnov 791a86c37a ffmpeg: add a warning stating that the program is deprecated. 2011-08-12 13:27:20 +02:00
Anton Khirnov 7221139ba0 lavc: make avcodec_init() static on next bump. 
It's called from avcodec_register() anyway, so there's no reason for it
to be public.
 2011-08-10 12:49:57 +02:00
Anton Khirnov 4d58e4cb4c Rename ffserver to avserver. 2011-08-09 19:56:25 +02:00
Anton Khirnov 9e12f0bf5f Rename ffprobe to avprobe. 2011-08-09 19:56:24 +02:00
Anton Khirnov 266463daff Rename ffplay to avplay. 2011-08-09 19:56:21 +02:00
Anton Khirnov b4ea1c5a77 Remove the ffserver test. 
It doesn't work and is therefore useless.
 2011-08-01 11:36:16 +02:00
Anton Khirnov e5fc6ab665 Remove ffserver.h 
It's unused an serves no purpose.
 2011-08-01 11:36:16 +02:00
Anton Khirnov ec6402b7c5 lavc: use designated initialisers for all codecs. 
It's more readable and less prone to breakage.
 2011-07-29 08:42:34 +02:00
Anton Khirnov e0e65ddb88 doc/fftools-common-opts: wording fixes missing from the previous commit. 2011-07-28 17:46:14 +02:00
Anton Khirnov 22b203baf8 doc: document using AVOptions in fftools. 2011-07-28 17:36:38 +02:00
Anton Khirnov 3c7fa664af lavf: add forgotten attribute_deprecated to av_find_stream_info() 2011-07-28 17:13:14 +02:00
Anton Khirnov dfc2c4d900 lavf: use designated initialisers for all (de)muxers. 
It's more readable and less prone to breakage.
 2011-07-17 06:58:37 +02:00
Anton Khirnov 6270995667 wav: remove a use of deprecated AV_METADATA_ macro 2011-07-17 06:58:29 +02:00
Anton Khirnov 412b4367c5 rmdec: remove useless ap parameter from rm_read_header_old() 2011-07-17 06:58:29 +02:00
Anton Khirnov d3bb71914b lavf/utils: drop av_ prefixes from static functions. 2011-07-15 20:27:43 +02:00
Anton Khirnov c3bec4cd13 avio: don't replicate avio_alloc_context functionality. 2011-07-15 20:04:46 +02:00
Anton Khirnov 6cb1197929 APIchanges: fill in missing hashes and dates. 2011-07-14 14:16:49 +02:00
Anton Khirnov f2f523fffc Add an APIChanges entry and bump minor versions for recent changes. 2011-07-14 14:16:16 +02:00
Anton Khirnov 8d03ca085f ffmpeg: print the low bitrate warning after the codec is openend. 
This doesn't access avcodec_opts, so it works with the new options
passing system.

Makes opt_bitrate() unneeded, so it's removed.
 2011-07-14 14:15:41 +02:00
Anton Khirnov e358f7ee90 lavf: fix invalid reads in avformat_find_stream_info() 2011-07-14 03:41:24 +02:00
Anton Khirnov 35d2e4e5c3 cmdutils: replace opt_default with opt_default2() and remove set_context_opts 2011-07-13 23:17:42 +02:00
Anton Khirnov bf174a70cd ffmpeg: use new avcodec_open2 and avformat_find_stream_info API. 2011-07-13 23:17:42 +02:00
Anton Khirnov 3009f521f3 ffplay: use new avcodec_open2 and avformat_find_stream_info API. 2011-07-13 23:17:42 +02:00
Anton Khirnov 8c8eab8bfe cmdutils: store all codec options in one dict instead of video/audio/sub 
Split them when codec id is known.
 2011-07-13 23:17:42 +02:00
Anton Khirnov a9eb4f0899 ffmpeg: check experimental flag after codec is opened. 
This doesn't access avcodec_opts, so it will work with the new options
passing system.
 2011-07-13 23:17:42 +02:00
Anton Khirnov 8e2d085516 ffmpeg: do not set GLOBAL_HEADER flag in the options context 
The removed lines have no effect, since the flag is set on all encoder
for the given file and avcodec_opts are reset between files.
 2011-07-13 23:17:42 +02:00
Anton Khirnov 13551ad1e3 lavf: fix segfault in av_open_input_stream() 
ic is NULL in case of error.
 2011-07-13 20:49:31 +02:00
Anton Khirnov 6379900c53 Add a check for strptime(). 
It's an XSI extension, not available on some supported systems.
 2011-07-13 12:14:27 +02:00
Anton Khirnov 001d668d40 lavf: factor out conversion of ISO8601 string to unix time 2011-07-13 12:14:25 +02:00
Anton Khirnov c7dd3e7e43 ffmpeg: get rid of a pointless limit on number of streams. 2011-07-13 10:37:24 +02:00
Anton Khirnov 646a9a1893 ffmpeg: remove an unused define. 2011-07-13 10:37:20 +02:00
Anton Khirnov 5f847bf61d lavf: deprecate AVFormatContext.timestamp 
It's replaced by 'creation_time' metadata tag.
 2011-07-12 15:30:10 +02:00
Anton Khirnov b12c259252 ffmpeg: merge input_files_ts_scale into InputStream. 2011-07-12 15:29:21 +02:00
Anton Khirnov 6fbf2485ad ffmpeg: don't abuse a global for passing sample format from input to output 
It's broken with multiple files or audio streams.
 2011-07-12 15:28:53 +02:00
Anton Khirnov 87c739a395 ffmpeg: don't abuse a global for passing channel layout from input to output 
It's broken with multiple files or audio streams.
 2011-07-12 15:28:22 +02:00
Anton Khirnov 1cede1d011 ffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream() 2011-07-12 15:26:04 +02:00
Anton Khirnov 93ade976c8 matroskaenc: make SSA default subtitle codec. 
It's a better format and we have an encoder for it, so it doesn't fail
like CODEC_ID_TEXT.
 2011-07-12 15:25:53 +02:00
Anton KhirnovandMans Rullgard fdb94444be matroskadec: fix stupid typo (!= -> ==) 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-10 22:04:03 +01:00