aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | ffmpeg: get rid of the output_streams_for_file vs. ost_table schizophreniaAnton Khirnov2011-08-301-62/+40
| | | | | | | | Instead store output streams in the same way as input streams.
* | Revert "Fix stream mapping regression"Michael Niedermayer2011-08-301-40/+1
| | | | | | | | | | | | Subsequent cherry picks are based on code prior to this, thus this needs to be rebased on HEAD by a volunteer. This reverts commit b25d931a82c7b95b2f47e6759c9d9be7705d664b.
* | ffmpeg: add a wrapper for output AVFormatContexts and merge output_opts into itAnton Khirnov2011-08-301-34/+46
| |
* | ffmpeg: make itsscale syntax consistent with other options.Anton Khirnov2011-08-301-23/+17
| | | | | | | | Move the stream specifier to the option name.
* | ffmpeg: factor out adding input streams.Anton Khirnov2011-08-301-67/+78
| |
* | ffmpeg: Factorize combining auto vsync with format.Alex Converse2011-08-301-3/+7
| |
* | ffmpeg: Factorize video resampling.Alex Converse2011-08-301-51/+60
| |
* | ffmpeg: Don't unnecessarily convert ipts to a double.Alex Converse2011-08-301-4/+5
| |
* | ffmpeg: don't segfault on 0 input files.Anton Khirnov2011-08-301-1/+1
| |
* | ffmpeg: remove pointless parameter from new_*_stream().Anton Khirnov2011-08-301-21/+21
| | | | | | | | New streams are always added to the last output file.
* | ffmpeg: cosmetics, move codeAnton Khirnov2011-08-301-124/+123
| | | | | | | | | | Move find_codec_or_die(), choose_codec(), new_output_stream() and read_avserver_streams() below transcode() where they belong.
* | ffmpeg: cosmetics -- move copy_chapters().Anton Khirnov2011-08-301-40/+40
| | | | | | | | | | It's only used in opt_output_file(), so move it right above opt_output_file().
* | ffmpeg: cosmetics -- move parse_forced_key_frames().Anton Khirnov2011-08-301-23/+23
| | | | | | | | | | parse_forced_key_frames() is only used in new_video_stream(), so move it right above new_video_stream().
* | ffmpeg: switch to a:b syntaxAnton Khirnov2011-08-301-3/+3
| |
* | ffmpeg: replace -vcodec/-acodec/-scodec with a better system.Anton Khirnov2011-08-301-149/+97
| | | | | | | | | | | | | | 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]
* | ffmpeg: remove presets.Anton Khirnov2011-08-301-45/+0
| | | | | | | | | | Nothing except x264 uses them and native x264 presets should be used with private options.
* | Revert "ffmpeg: simplify opt_*_codec() options"Michael Niedermayer2011-08-301-23/+40
| | | | | | | | | | | | This is needed because the following cherry picks are based on code prior of this This reverts commit f712f6c8a4bd14bae3c41118af642b5dae7f6e2b.
* | ffmpeg: change semantics of -mapAnton Khirnov2011-08-301-31/+75
| | | | | | | | | | | | | | 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.
* | ffmpeg: get rid of new* options.Anton Khirnov2011-08-301-206/+103
| | | | | | | | | | | | | | | | | | | | 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.
* | ffmpeg: rename sameq variables to same_quantAnton Khirnov2011-08-301-7/+7
| |
* | ffmpeg: make -map_metadata work consistently with the other optionsAnton Khirnov2011-08-301-72/+73
| | | | | | | | | | | | | | | | | | 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.
* | ffmpeg: make -map_chapters accept only the input file index.Anton Khirnov2011-08-301-57/+23
| | | | | | | | | | | | This is consistent with how all the other options work Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Set codec_type in new_output_streamMichael Niedermayer2011-08-301-1/+3
| | | | | | | | | | | | Ported from a change from anton khirnov to avconv Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: rename ffmpeg_exit in exit_programAnton Khirnov2011-08-301-73/+73
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Support queing filter commands for later timesMichael Niedermayer2011-08-291-4/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Support passing commands to filters at runtimeMichael Niedermayer2011-08-291-0/+17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use avcodec_get_name to report missing en/decoders.Nicolas George2011-08-221-4/+4
| |
* | ffmpeg: print the codecs names in the stream mapping.Nicolas George2011-08-221-0/+7
| |
* | ffmpeg: ignore forward gaps for subtitles streams.Nicolas George2011-08-221-1/+4
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-181-15/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) h264: hide reference frame errors unless requested swscale: split hScale() function pointer into h[cy]Scale(). Move clipd macros to x86util.asm. avconv: reindent. avconv: rescue poor abused start_time global. avconv: rescue poor abused recording_time global. avconv: merge two loops in output_packet(). avconv: fix broken indentation. avconv: get rid of the arbitrary MAX_FILES limit. avconv: get rid of the output_streams_for_file vs. ost_table schizophrenia avconv: add a wrapper for output AVFormatContexts and merge output_opts into it avconv: make itsscale syntax consistent with other options. avconv: factor out adding input streams. avconv: Factorize combining auto vsync with format. avconv: Factorize video resampling. avconv: Don't unnecessarily convert ipts to a double. ffmpeg: remove unsed variable nopts RV3/4 parser: remove unused variable 'off' add XMV demuxer rmdec: parse FPS in RealMedia properly ... Conflicts: avconv.c libavformat/version.h libswscale/swscale.c tests/ref/fate/lmlm4-demux Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: remove unsed variable noptsDiego Biurrun2011-08-171-4/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-161-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings avconv: remove a write-only variable avconv: remove pointless parameter from new_*_stream(). avconv: cosmetics, move code avconv: cosmetics -- move copy_chapters(). avconv: cosmetics -- move parse_forced_key_frames(). lavc: add audio flag to the 'b' option, deprecate 'ab'. avconv: rename sameq to same_quant doc/avconv: add forgotten end of chapter. Changelog: document avconv incompatibilities with ffmpeg. avconv: replace -vcodec/-acodec/-scodec with a better system. avconv: remove presets. svq3: propagate codec memory allocation failure in context init Conflicts: Changelog avconv.c libavcodec/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-151-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix NASM include directive dsputil_mmx: Honor HAVE_AMD3DNOW lavf,lavd: remove all usage of AVFormatParameters from demuxers. jack: add 'channels' private option. VC-1: fix reading of custom PAR. Remove redundant and dubious video codec detection by its extradata mpeg12: remove repeat-field code disabled since May 2002 patch checklist: suggest fate instead of regression tests Turn on resampling on sudden size change instead of bailing out during recode. avtools: reinitialise filter chain when input video stream changes dimensions Conflicts: Makefile avconv.c doc/developer.texi ffplay.c libavcodec/x86/dsputil_mmx.c libavdevice/libdc1394.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12: remove repeat-field code disabled since May 2002Dustin Brody2011-08-151-2/+0
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | ffmpeg: fix null pointer segfault on solaris. (ticket381)Michael Niedermayer2011-08-131-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'Michael Niedermayer2011-08-131-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2c087871dafc7d030b2d48457ddff597dfd4925': Move x86util.asm from libavcodec/ to libavutil/. Move x86inc.asm to libavutil/. APIchanges: note error_recognition in lavf lavf: add support for error_recognition, use it in avidec, and bump minor API version avconv: change semantics of -map avconv: get rid of new* options. cmdutils: allow precisely specifying a stream for AVOptions. configure: add missing CFLAGS to fix building on the HURD libx264: Include hint for possible values for configuring libx264 cmdutils: allow ':'-separated modifiers in option names. avconv: make -map_metadata work consistently with the other options avconv: remove deprecated options. avconv: make -map_chapters accept only the input file index. Make a copy of ffmpeg under a new name -- avconv. ffmpeg: add a warning stating that the program is deprecated. Add weighted motion compensation for RV40 B-frames RV3/4: calculate B-frame motion weights once per frame Move RV3/4-specific DSP functions into their own context mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt h264: notice memory allocation failure Conflicts: .gitignore Makefile cmdutils.c configure doc/ffplay.texi doc/ffprobe.texi doc/ffserver.texi libavcodec/libx264.c libavformat/avformat.h libavformat/avidec.c libavformat/version.h tests/lavf-regression.sh tests/lavfi-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: allow precisely specifying a stream for AVOptions.Anton Khirnov2011-08-121-2/+2
| |
| * ffmpeg: add a warning stating that the program is deprecated.Anton Khirnov2011-08-121-0/+4
| |
| * Rename ffserver to avserver.Anton Khirnov2011-08-091-4/+4
| |
* | ffmpeg: fix passlogfile regressionCarl Eugen Hoyos2011-08-091-0/+4
| |
* | ffmpeg: Fix doxygen comments for MetadataMapMichael Niedermayer2011-08-051-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix possible crash when decoding mpeg streams.Carl Eugen Hoyos2011-08-041-2/+4
| | | | | | | | | | This reverts 2cf8355f98681bdd726b739008acd5483f82f8d7, fixes ticket 329.
* | Fix -loop_input.Carl Eugen Hoyos2011-08-031-5/+5
| |
* | Do not ignore opt_default() return values.Carl Eugen Hoyos2011-08-011-8/+4
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h263dec: Propagate AV_LOG_ERRORs from slice decoding through frame decoding with sufficient error recognition x86: cabac: don't load/store context values in asm H.264: optimize CABAC x86 asm for Atom vp3/theora: flush after seek. doc/fftools-common-opts: wording fixes missing from the previous commit. doc: document using AVOptions in fftools. cmdutils: add codec_opts parameter to setup_find_stream_info_opts() cmdutils: clarify documentation for filter_codec_opts() cmdutils: clarify documentation for setup_find_stream_info_opts() lavf: add forgotten attribute_deprecated to av_find_stream_info() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: add codec_opts parameter to setup_find_stream_info_opts()Stefano Sabatini2011-07-281-1/+1
| | | | | | | | | | | | Avoid brittle and obfuscating reference to a global. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | ffmpeg: better timebase guessing for stream copyMichael Niedermayer2011-07-251-7/+17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not use AVFMT_FLAG_NONBLOCK for the output file.Nicolas George2011-07-191-1/+0
| | | | | | | | | | Restore the commit 0de8ebf by Carl Eugen Hoyos that was lost during the merge 58257ea.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-171-4/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffmpeg: fix some indentation ffmpeg: fix operation with --disable-avfilter simple_idct: remove disabled code motion_est: remove disabled code vc1: remove disabled code fate: separate lavf-mxf_d10 test from lavf-mxf cabac: Move code only used in the cabac test program to cabac.c. ffplay: warn that -pix_fmt is no longer working, suggest alternative ffplay: warn that -s is no longer working, suggest alternative lavf: rename enc variable in utils.c:has_codec_parameters() lavf: use designated initialisers for all (de)muxers. wav: remove a use of deprecated AV_METADATA_ macro rmdec: remove useless ap parameter from rm_read_header_old() dct-test: remove write-only variable des: fix #if conditional around P_shuffle Use LOCAL_ALIGNED in ff_check_alignment() Conflicts: ffmpeg.c libavformat/avidec.c libavformat/matroskaenc.c libavformat/mp3enc.c libavformat/oggenc.c libavformat/utils.c tests/ref/lavf/mxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: fix some indentationMans Rullgard2011-07-171-6/+6
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-12 12:29:59 +0000