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
32,187 Commits 37 Branches 400 Tags 458 MiB
76e4873319
Commit Graph

32187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Khirnov
76e4873319 ffmpeg: 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-30 18:08:22 +02:00
Michael Niedermayer
b091de2285 Revert "Fix stream mapping regression" 
Subsequent cherry picks are based on code prior to this, thus this needs to be rebased
on HEAD by a volunteer.
This reverts commit b25d931a82.
 2011-08-30 18:06:37 +02:00
Anton Khirnov
61b933f554 ffmpeg: add a wrapper for output AVFormatContexts and merge output_opts into it 2011-08-30 17:58:00 +02:00
Anton Khirnov
0ea58d7115 ffmpeg: make itsscale syntax consistent with other options. 
Move the stream specifier to the option name.
 2011-08-30 17:58:00 +02:00
Anton Khirnov
81e4655566 ffmpeg: factor out adding input streams. 2011-08-30 17:58:00 +02:00
Alex Converse
a6d0340ca1 ffmpeg: Factorize combining auto vsync with format. 2011-08-30 17:57:59 +02:00
Alex Converse
ebf94f439e ffmpeg: Factorize video resampling. 2011-08-30 17:57:59 +02:00
Alex Converse
dadbebbbbc ffmpeg: Don't unnecessarily convert ipts to a double. 2011-08-30 17:57:59 +02:00
Anton Khirnov
7357f6e678 ffmpeg: don't segfault on 0 input files. 2011-08-30 17:57:59 +02:00
Anton Khirnov
6e675b504a ffmpeg: remove pointless parameter from new_*_stream(). 
New streams are always added to the last output file.
 2011-08-30 17:57:59 +02:00
Anton Khirnov
868013aa01 ffmpeg: cosmetics, move code 
Move find_codec_or_die(), choose_codec(), new_output_stream() and
read_avserver_streams() below transcode() where they belong.
 2011-08-30 17:57:59 +02:00
Anton Khirnov
6f610fa144 ffmpeg: cosmetics -- move copy_chapters(). 
It's only used in opt_output_file(), so move it right above
opt_output_file().
 2011-08-30 17:57:59 +02:00
Anton Khirnov
c692eda3e7 ffmpeg: 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-30 17:57:59 +02:00
Anton Khirnov
f69e8c7d15 ffmpeg: switch to a:b syntax 2011-08-30 17:57:59 +02:00
Anton Khirnov
e3bf4e292c ffmpeg: 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-30 17:57:59 +02:00
Anton Khirnov
a0147957e7 ffmpeg: remove presets. 
Nothing except x264 uses them and native x264 presets should be used
with private options.
 2011-08-30 17:57:59 +02:00
Michael Niedermayer
2d726b195e Revert "ffmpeg: simplify opt_*_codec() options" 
This is needed because the following cherry picks are based on code prior of this

This reverts commit f712f6c8a4.
 2011-08-30 17:57:59 +02:00
Anton Khirnov
88bfe4518b ffmpeg: 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-30 17:57:59 +02:00
Anton Khirnov
f12f40b31a ffmpeg: 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-30 17:57:59 +02:00
Anton Khirnov
7efec8dd6d ffmpeg: rename sameq variables to same_quant 2011-08-30 17:57:59 +02:00
Anton Khirnov
5a9e42ec45 ffmpeg: 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-30 17:57:59 +02:00
Anton Khirnov
6bf3c39d17 ffmpeg: make -map_chapters accept only the input file index. 
This is consistent with how all the other options work

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-30 17:57:59 +02:00
Michael Niedermayer
97861f5b08 ffmpeg: Set codec_type in new_output_stream 
Ported from a change from anton khirnov to avconv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-30 17:57:59 +02:00
Anton Khirnov
a0ce297b69 ffmpeg: rename ffmpeg_exit in exit_program 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-30 17:57:59 +02:00
Carl Eugen Hoyos
c41bf905f4 Only autodetect loas in transport streams. 
The Makito encoder sets stream type 0x11 for AAC.
This patch should be reverted if it breaks decoding valid streams (and
the problem can't be fixed in the probe function).
 2011-08-30 10:46:51 +02:00
Carl Eugen Hoyos
75a225217c Support Nellymoser in isom. 2011-08-30 10:46:51 +02:00
Carl Eugen Hoyos
66624cbb80 Disable cropping for the brainfart case. 
This fixes ticket #348 for the few users who have a playback application
that supports Sisvel 3D. The other 99% have to wait until FFmpeg
supports arbitrary cropping.
 2011-08-30 10:46:50 +02:00
Stefano Sabatini
c70e8523af vsrc_testsrc: set more properties in the output frames 2011-08-30 10:03:19 +02:00
Stefano Sabatini
bf917e26e1 fifo: add note in av_fifo_realloc2() doxy regarding reallocation failure behavior 2011-08-30 10:03:13 +02:00
Clément Bœsch
0629b1ff35 ffprobe: introduce output format writers. 2011-08-30 09:28:31 +02:00
Baptiste Coudurier
f33be93b1b mov: read tmcd tag and set timecode drop flag accordingly. 2011-08-30 09:14:05 +02:00
Michael Niedermayer
6270207511 h264: allow debuging SEI types 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-30 05:41:44 +02:00
Carl Eugen Hoyos
caf63ebd0b Fix some APIchange versions. 2011-08-30 00:19:58 +02:00
Michael Niedermayer
db5effe1a4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Revert "h264: Properly set coded_{width, height} when parsing H.264."
  isom: add missing AVC-Intra tags, rearrange list and update comments
  avconv: remove stubs of crop* and pad* options
  avconv: re-add nb_streams to InputFile.

Conflicts:
	avconv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 22:24:01 +02:00
Michael Niedermayer
ea36c44e84 avfilter_graph_queue_command: Allow queueing commands out of order 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 20:55:22 +02:00
Michael Niedermayer
37f9de59d1 avfilter: fix processing multiple commands per frame and filter 
Found-by: Nicolas George
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 20:39:34 +02:00
Michael Niedermayer
50be0b911a ffmpeg: Support queing filter commands for later times 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 20:16:13 +02:00
Michael Niedermayer
3d8176d2f5 avfilter: Add avfilter_graph_que_command() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 20:16:10 +02:00
Michael Niedermayer
f782ce3b4d drawtext: Support changing parameters through reinit command at runtime. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 20:16:08 +02:00
Michael Niedermayer
bb22f39fe2 ffmpeg: Support passing commands to filters at runtime 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 20:16:06 +02:00
Michael Niedermayer
1e5014c7c7 avfilter: Add command passing support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 20:16:01 +02:00
Luca Barbato
22141917a9 Revert "h264: Properly set coded_{width, height} when parsing H.264." 
This reverts commit b47904d158.

coded_{width, height} overwrites width and height in avcodec_open and
it currently just report the non-lowres size.
 2011-08-29 18:32:31 +02:00
Tomas Härdin
8b7222979c isom: add missing AVC-Intra tags, rearrange list and update comments 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-08-29 16:48:39 +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
Michael Niedermayer
4becc86139 issue_tracker.txt: more updates toward trac 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 04:34:35 +02:00
Michael Niedermayer
6e2c036bb8 doc/issue_tracker.txt: regressions are important 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 04:32:04 +02:00
Michael Niedermayer
80d4538d05 doc/issue_tracker.txt: Update toward trac 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 04:30:06 +02:00
Carl Eugen Hoyos
312645e030 Do not set codec_tag property for matroska muxers. 
Fixes ticket #8.
 2011-08-28 23:13:17 +02:00
Carl Eugen Hoyos
ab539d9eb8 Use the shorter channel layout description for the common case. 2011-08-28 22:37:11 +02:00