summaryrefslogtreecommitdiff
path: root/ffmpeg_opt.c
Commit message (Collapse)AuthorAge
* ffmpeg: remove hardcoded 'now' creation_time supportMarton Balint2016-03-03
| | | | | | | | Every date parsing routine now uses av_parse_time which handles 'now' and provides greater precision as well. This change also enables the segmenter muxer to set the proper 'now' creation time at the beginning of each segment. Signed-off-by: Marton Balint <cus@passwd.hu>
* Merge commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140'Derek Buitenhuis2016-02-17
| | | | | | | | * commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140': avconv_vdpau: use the hwcontext API to simplify code Tested-by: wm4 Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* ffmpeg_opt: Fix memleaks in "manually set programs" loopMichael Niedermayer2016-02-08
| | | | | | Fixes CID1351356, CID1351357 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg_opt: Allow -metadata option to set metadata on programs.Vittorio Gambaletta (VittGam)2016-01-26
| | | | | Signed-off-by: Vittorio Gambaletta <ffmpeg-dev@vittgam.net> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg_opt: Move the 'process manually set programs' block above 'process ↵Vittorio Gambaletta (VittGam)2016-01-26
| | | | | | | manually set metadata' in open_output_file(). Signed-off-by: Vittorio Gambaletta <ffmpeg-dev@vittgam.net> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: use lavf API for applying bitstream filtersRodger Combs2015-12-28
|
* ffmpeg: Allow specifying the program number for created programsMichael Niedermayer2015-12-16
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Add basic support to mux multiple programsMichael Niedermayer2015-12-11
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* all: remove some casts of function pointer to void *Ganesh Ajjanagadde2015-10-24
| | | | | | | | | | These casts are unnecessary, and may safely be removed. Found by enabling -Wpedantic on clang 3.7. Tested with FATE. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* ffmpeg: add abort_on option to allow aborting on empty outputMarton Balint2015-10-22
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'Hendrik Leppkes2015-10-22
| | | | | | | * commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8': avconv: add support for Intel QSV-accelerated transcoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* ffmpeg_opt: rename loop option to stream_loopMichael Niedermayer2015-10-14
| | | | | | | | | | | | | The "loop" option is used in several demuxers (like img2dec) and muxers, using the same name in ffmpeg_opt breaks them. Feel free to revert this and replace by any other solution or rename both as preferred This is just as a quick fix to avoid the regression with existing command lines and to have both named the same (which does not work) Example: ./ffmpeg -loop 1 -i fate-suite/png1/lena-rgb24.png -t 1 test.avi will produce 25 frames with the img2dec loop but only 1 frame at 25fps with the ffmpeg loop option Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '16b0c929621f84983b83b9735ce973acb12723bc'Hendrik Leppkes2015-10-14
| | | | | | | * commit '16b0c929621f84983b83b9735ce973acb12723bc': avconv: Add loop option. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* Merge commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60'Hendrik Leppkes2015-09-29
| | | | | | | * commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60': avconv: Make the private options discovery more manifest Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* Merge commit '3973f0f773e0bd212734eccda78aa798f8b20692'Hendrik Leppkes2015-09-29
| | | | | | | * commit '3973f0f773e0bd212734eccda78aa798f8b20692': Revert "avconv_opt: Allow printing private options" Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* Merge commit '7bb1c1bfd22de2200743af04ebd0c7c775f56f7e'Hendrik Leppkes2015-09-17
| | | | | | | * commit '7bb1c1bfd22de2200743af04ebd0c7c775f56f7e': avconv_opt: Allow printing private options Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* ffmpeg: Improve help text for -target.Carl Eugen Hoyos2015-09-02
| | | | Fixes ticket #1057.
* Put remaining pieces of CODEC_FLAG_EMU_EDGE under FF_API_EMU_EDGE.Ronald S. Bultje2015-08-28
| | | | | | The amv one probably looks suspicious, but since it's an intra-only codec, I couldn't possibly imagine what it would use the edge for, and the vsynth fate result doesn't change, so it's probably OK.
* ffmpeg_opt: Add -hwaccels option that lists all supported hwaccelsTimothy Gu2015-08-26
|
* ffmpeg_opt: Add missing commaTimothy Gu2015-08-25
|
* ffmpeg_opt: Prefer audio streams with packetsMichael Niedermayer2015-08-14
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: switch swscale option handling to AVDictionary similar to what the ↵Michael Niedermayer2015-08-08
| | | | | | other subsystems use Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec: add new Videotoolbox hwaccel.Sebastien Zwickert2015-08-03
|
* ffmpeg_op: Print warning if duration isnt known when -sseof is usedMichael Niedermayer2015-07-29
| | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Implement support for seeking relative to EOFMichael Niedermayer2015-07-29
| | | | | | Fixes Ticket227 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer2015-07-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'Michael Niedermayer2015-07-19
| | | | | | | | | | | * commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c': avconv: split creating and (re-)configuring complex filtergraphs Conflicts: ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727'Michael Niedermayer2015-07-19
| | | | | | | | | | * commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727': avconv: create the complex filtergraphs earlier Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '1959351aecf09fc3e90208ff775f4849801dc13f'Michael Niedermayer2015-07-19
| | | | | | | * commit '1959351aecf09fc3e90208ff775f4849801dc13f': avconv: move the no streams failure to open_output_file() Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e'Michael Niedermayer2015-07-19
| | | | | | | | | | | | * commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e': avconv: use read_file() for reading the 2pass stats Conflicts: cmdutils.c cmdutils.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '6d5d9246042acb804a652e6fedfb7afe0ca85614'Michael Niedermayer2015-07-19
| | | | | | | | | | * commit '6d5d9246042acb804a652e6fedfb7afe0ca85614': avconv: move handling the 2pass logfile into avconv_opt Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '59245e0c5e10a849e67c632cccf4f677b2442e82'Michael Niedermayer2015-07-19
| | | | | | | | | | * commit '59245e0c5e10a849e67c632cccf4f677b2442e82': avconv: set the encoding/decoding_needed flags earlier Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg_opt: Fix stream copy flag for attachmentsMichael Niedermayer2015-07-19
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg_opt: allow the user to ignore unused stream mapsRodger Combs2015-07-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Favor streams that had packetsMichael Niedermayer2015-07-01
| | | | | | Fixes Thailand-Wave.wmv without explicitly specifying a stream Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Fix forcing fourccsMichael Niedermayer2015-07-01
| | | | | | Fixes Ticket4682 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Fix sync_istMichael Niedermayer2015-06-26
| | | | | | This code was lost in 2663540821ee010edc7a47316b00a4745aaf973c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Fix handling of creation_time nowMichael Niedermayer2015-06-21
| | | | | | Fixes Ticket4495 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6'Michael Niedermayer2015-06-12
| | | | | | | | | | | * commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6': avconv_opt: Check localtime() return value Conflicts: ffmpeg_opt.c See: 8e91d9652ea5048d9014e7636e12c6ed4732d7b7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Check for localtime() failureMichael Niedermayer2015-06-12
| | | | | Found-by: Daemon404 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Set the video VBV parameters only for the video stream from -targetMichael Niedermayer2015-05-25
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Support copying unknown streamsMichael Niedermayer2015-05-21
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: add missing space in error messageMichael Niedermayer2015-05-21
| | | | | Found-by: rcombs Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: fix the error message log level for the unsupported stream typesMichael Niedermayer2015-05-21
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Give the user a hint on how to ignore unsupported streamsMichael Niedermayer2015-05-21
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: support ignoring unsupported mapped streamsRodger Combs2015-05-21
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Compensate for DTS/PTS difference in seeking when its based on DTSMichael Niedermayer2015-05-18
| | | | | | Fixes Ticket4554 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Do not copy the display matrix if rotation meta-data is manually addedMichael Niedermayer2015-05-18
| | | | | | Fixes Ticket4560 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Fix -timestamp parsingMichael Niedermayer2015-05-09
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: remove rotate metadata in case of autorotateMichael Niedermayer2015-05-02
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>