aboutsummaryrefslogtreecommitdiff
path: root/ffmpeg_opt.c
AgeCommit message (Collapse)Author
2015-12-28ffmpeg: use lavf API for applying bitstream filtersRodger Combs
2015-12-16ffmpeg: Allow specifying the program number for created programsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-11ffmpeg: Add basic support to mux multiple programsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-24all: remove some casts of function pointer to void *Ganesh Ajjanagadde
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>
2015-10-22ffmpeg: add abort_on option to allow aborting on empty outputMarton Balint
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
2015-10-22Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'Hendrik Leppkes
* commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8': avconv: add support for Intel QSV-accelerated transcoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-14ffmpeg_opt: rename loop option to stream_loopMichael Niedermayer
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>
2015-10-14Merge commit '16b0c929621f84983b83b9735ce973acb12723bc'Hendrik Leppkes
* commit '16b0c929621f84983b83b9735ce973acb12723bc': avconv: Add loop option. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29Merge commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60'Hendrik Leppkes
* commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60': avconv: Make the private options discovery more manifest Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29Merge commit '3973f0f773e0bd212734eccda78aa798f8b20692'Hendrik Leppkes
* commit '3973f0f773e0bd212734eccda78aa798f8b20692': Revert "avconv_opt: Allow printing private options" Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-17Merge commit '7bb1c1bfd22de2200743af04ebd0c7c775f56f7e'Hendrik Leppkes
* commit '7bb1c1bfd22de2200743af04ebd0c7c775f56f7e': avconv_opt: Allow printing private options Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-02ffmpeg: Improve help text for -target.Carl Eugen Hoyos
Fixes ticket #1057.
2015-08-28Put remaining pieces of CODEC_FLAG_EMU_EDGE under FF_API_EMU_EDGE.Ronald S. Bultje
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.
2015-08-26ffmpeg_opt: Add -hwaccels option that lists all supported hwaccelsTimothy Gu
2015-08-25ffmpeg_opt: Add missing commaTimothy Gu
2015-08-14ffmpeg_opt: Prefer audio streams with packetsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-08ffmpeg: switch swscale option handling to AVDictionary similar to what the ↵Michael Niedermayer
other subsystems use Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-03avcodec: add new Videotoolbox hwaccel.Sebastien Zwickert
2015-07-29ffmpeg_op: Print warning if duration isnt known when -sseof is usedMichael Niedermayer
Found-by: ubitux Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-29ffmpeg: Implement support for seeking relative to EOFMichael Niedermayer
Fixes Ticket227 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer
* 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>
2015-07-19Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'Michael Niedermayer
* commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c': avconv: split creating and (re-)configuring complex filtergraphs Conflicts: ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19Merge commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727'Michael Niedermayer
* commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727': avconv: create the complex filtergraphs earlier Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19Merge commit '1959351aecf09fc3e90208ff775f4849801dc13f'Michael Niedermayer
* commit '1959351aecf09fc3e90208ff775f4849801dc13f': avconv: move the no streams failure to open_output_file() Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e'Michael Niedermayer
* 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>
2015-07-19Merge commit '6d5d9246042acb804a652e6fedfb7afe0ca85614'Michael Niedermayer
* commit '6d5d9246042acb804a652e6fedfb7afe0ca85614': avconv: move handling the 2pass logfile into avconv_opt Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19Merge commit '59245e0c5e10a849e67c632cccf4f677b2442e82'Michael Niedermayer
* commit '59245e0c5e10a849e67c632cccf4f677b2442e82': avconv: set the encoding/decoding_needed flags earlier Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19ffmpeg_opt: Fix stream copy flag for attachmentsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-06ffmpeg_opt: allow the user to ignore unused stream mapsRodger Combs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01ffmpeg_opt: Favor streams that had packetsMichael Niedermayer
Fixes Thailand-Wave.wmv without explicitly specifying a stream Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01ffmpeg_opt: Fix forcing fourccsMichael Niedermayer
Fixes Ticket4682 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-26ffmpeg_opt: Fix sync_istMichael Niedermayer
This code was lost in 2663540821ee010edc7a47316b00a4745aaf973c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-21ffmpeg_opt: Fix handling of creation_time nowMichael Niedermayer
Fixes Ticket4495 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-12Merge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6'Michael Niedermayer
* commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6': avconv_opt: Check localtime() return value Conflicts: ffmpeg_opt.c See: 8e91d9652ea5048d9014e7636e12c6ed4732d7b7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-12ffmpeg_opt: Check for localtime() failureMichael Niedermayer
Found-by: Daemon404 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-25ffmpeg_opt: Set the video VBV parameters only for the video stream from -targetMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-21ffmpeg: Support copying unknown streamsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-21ffmpeg_opt: add missing space in error messageMichael Niedermayer
Found-by: rcombs Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-21ffmpeg_opt: fix the error message log level for the unsupported stream typesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-21ffmpeg_opt: Give the user a hint on how to ignore unsupported streamsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-21ffmpeg: support ignoring unsupported mapped streamsRodger Combs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-18ffmpeg_opt: Compensate for DTS/PTS difference in seeking when its based on DTSMichael Niedermayer
Fixes Ticket4554 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-18ffmpeg: Do not copy the display matrix if rotation meta-data is manually addedMichael Niedermayer
Fixes Ticket4560 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09ffmpeg_opt: Fix -timestamp parsingMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02ffmpeg_opt: remove rotate metadata in case of autorotateMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'Michael Niedermayer
* commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2': avconv: Add an option for automatically rotating video according to display matrix Conflicts: Changelog ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20ffmpeg: add option not to offset seek position by start timewm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035'Michael Niedermayer
* commit '3892bdab9b652eb003ab95e167f1765e0b0ea035': avconv: do not overwrite the stream codec context for streamcopy Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-02ffmpeg_opt.c: fix regression introduced in 5743095cTim Nicholson
-vtag is an input and output option. Signed-off-by: Tim Nicholson <tim.nicholson@bbc.co.uk> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-28ffmpeg_opt: Do not overwrite output if there is no inputMichael Niedermayer
Fixes Ticket4254 Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 17:17:22 +0000