summaryrefslogtreecommitdiff
path: root/ffmpeg_opt.c
Commit message (Collapse)AuthorAgeFilesLines
* Avoid using the term "file" and prefer "url" in some docs and commentsMichael Niedermayer2016-12-061-2/+2
| | | | | | | | This should make it less ambigous that these are URLs Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit a5f27a9c3aa973c543bd8bbf2a78363700bbc03e) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc'Hendrik Leppkes2016-10-081-0/+12
| | | | | | | * commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc': avconv: buffer the packets written while the muxer is not initialized Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* ffmpeg: don't reconfigure terminal if we're not taking input from stdinRodger Combs2016-10-061-0/+3
|
* ffmpeg: stop using AVStream.codec on stream copyJames Almer2016-09-271-0/+3
| | | | | | | | | | | | This commit is based on commit 35c8580 from Anton Khirnov <anton@khirnov.net> which was skipped in b8945c4. The avcodec_copy_context() call in the encode path is left in place for now as AVStream.codec is apparently still required even after porting ffmpeg to the new bsf API. Tested-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* ffmpeg: fix memleak of bitstream filter context on failureJames Almer2016-09-251-4/+4
| | | | | | | | Increase the nb_bitstream_filters value as soon as the context is allocated, so if option parsing fails the last context is actually freed. Reviewed-by: Josh de Kock <josh@itanimul.li> Signed-off-by: James Almer <jamrial@gmail.com>
* ffmpeg: Fix bistream typosMichael Niedermayer2016-09-251-1/+1
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: switch to the new BSF APIClément Bœsch2016-09-241-20/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is initially largely based on commit 4426540 from Anton Khirnov <anton@khirnov.net> and two following fixes (80fb19b and fe7b21c) which were previously skipped respectively in 98e3153, c9ee36e, and 7fe7cdc. mpeg4-bsf-unpack-bframes FATE reference is updated because the bsf filter now actually fixes the extradata (mpeg4_unpack_bframes_init() changing one byte is now honored on the output extradata). The FATE references for remove_extra change because the packet flags were wrong and the keyframes weren't marked, causing the bsf relying on these proprieties to not actually work as intended. The following was fixed by James Almer: The filter option arguments are now also parsed correctly. A hack to propagate extradata changed by bitstream filters after the first av_bsf_receive_packet() call is added to maintain the current behavior. This was previously done by av_bitstream_filter_filter() and is needed for the aac_adtstoasc bsf. The exit_on_error was not being checked anymore, and led to an exit error in the last frame of h264_mp4toannexb test. Restoring this behaviour prevents erroring out. The test is still changed as a result due to the badly filtered frame now not being written after the failure. Signed-off-by: Clément Bœsch <u@pkh.me> Signed-off-by: James Almer <jamrial@gmail.com>
* ffmpeg: switch to codecparClément Bœsch2016-09-211-60/+80
| | | | | | | | | | | | | | | | | | | | This commit is largely based on commit 15e84ed3 from Anton Khirnov <anton@khirnov.net> which was previously skipped in bbf5ef9d. There are still a bunch of things raising codecpar related warnings that need fixing, such as: - the use of codec->debug in the interactive debug mode - read_ffserver_streams(): it's probably broken now but there is no test - lowres stuff - codec copy apparently required by bitstream filters The matroska references are updated because they now properly forward the field_order (previously unknown, now progressive). Thanks to James Almer for fixing a bunch of FATE issues in this commit. Signed-off-by: Clément Bœsch <clement@stupeflix.com> Signed-off-by: James Almer <jamrial@gmail.com>
* ffmpeg_opt: Suggest to use "file:..." if a protocol was not found.Carl Eugen Hoyos2016-09-071-0/+2
| | | | Fixes Debian bug 785690.
* Merge commit '90944ee3ab79081845ea1bd97eea475031ce0842'James Almer2016-08-061-14/+37
| | | | | | | | | | | * commit '90944ee3ab79081845ea1bd97eea475031ce0842': avconv: refactor selecting an encoder Conflicts: ffmpeg.c ffmpeg_opt.c Merged-by: James Almer <jamrial@gmail.com>
* ffmpeg_opt: Remove duplicated initialization of attachment streamTimothy Gu2016-08-031-2/+0
| | | | | These two fields are already initialized to the same values in new_attachment_stream().
* Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into mergeTimothy Gu2016-08-031-2/+14
| | | | | | | * commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee': avconv: create simple filtergraphs earlier Merged-by: Timothy Gu <timothygu99@gmail.com>
* ffmpeg_opt: Delete duplicate “hwaccel_output_format” option.Jun Zhao2016-07-201-3/+0
| | | | | | | Delete duplicate “hwaccel_output_format” option. Signed-off-by: Jun Zhao <mypopydev@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Add cuvid hwaccel supportTimo Rothenpieler2016-06-101-0/+3
|
* Merge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f'Derek Buitenhuis2016-05-081-0/+43
| | | | | | | * commit '5d273d3efac340ef8de445c955ff44c7abed4e8f': avconv: VAAPI hwcontext initialisation and hwaccel helper Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* ffmpeg: remove hardcoded 'now' creation_time supportMarton Balint2016-03-031-13/+0
| | | | | | | | 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-171-3/+0
| | | | | | | | * 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-081-1/+11
| | | | | | 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-261-0/+7
| | | | | 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-261-56/+56
| | | | | | | 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-281-1/+5
|
* ffmpeg: Allow specifying the program number for created programsMichael Niedermayer2015-12-161-1/+21
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Add basic support to mux multiple programsMichael Niedermayer2015-12-111-0/+38
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* all: remove some casts of function pointer to void *Ganesh Ajjanagadde2015-10-241-4/+4
| | | | | | | | | | 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-221-0/+21
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'Hendrik Leppkes2015-10-221-0/+3
| | | | | | | * 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-141-1/+1
| | | | | | | | | | | | | 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-141-0/+8
| | | | | | | * commit '16b0c929621f84983b83b9735ce973acb12723bc': avconv: Add loop option. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* Merge commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60'Hendrik Leppkes2015-09-291-0/+1
| | | | | | | * commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60': avconv: Make the private options discovery more manifest Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* Merge commit '3973f0f773e0bd212734eccda78aa798f8b20692'Hendrik Leppkes2015-09-291-60/+0
| | | | | | | * commit '3973f0f773e0bd212734eccda78aa798f8b20692': Revert "avconv_opt: Allow printing private options" Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* Merge commit '7bb1c1bfd22de2200743af04ebd0c7c775f56f7e'Hendrik Leppkes2015-09-171-0/+60
| | | | | | | * 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-021-2/+2
| | | | Fixes ticket #1057.
* Put remaining pieces of CODEC_FLAG_EMU_EDGE under FF_API_EMU_EDGE.Ronald S. Bultje2015-08-281-0/+2
| | | | | | 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-261-0/+14
|
* ffmpeg_opt: Add missing commaTimothy Gu2015-08-251-1/+1
|
* ffmpeg_opt: Prefer audio streams with packetsMichael Niedermayer2015-08-141-3/+5
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: switch swscale option handling to AVDictionary similar to what the ↵Michael Niedermayer2015-08-081-1/+1
| | | | | | other subsystems use Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec: add new Videotoolbox hwaccel.Sebastien Zwickert2015-08-031-1/+7
|
* ffmpeg_op: Print warning if duration isnt known when -sseof is usedMichael Niedermayer2015-07-291-2/+6
| | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Implement support for seeking relative to EOFMichael Niedermayer2015-07-291-0/+6
| | | | | | Fixes Ticket227 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer2015-07-271-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-191-10/+23
| | | | | | | | | | | * 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-191-4/+7
| | | | | | | | | | * 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-191-0/+6
| | | | | | | * 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-191-3/+3
| | | | | | | | | | | | * 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-191-0/+36
| | | | | | | | | | * 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-191-0/+11
| | | | | | | | | | * 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-191-1/+1
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg_opt: allow the user to ignore unused stream mapsRodger Combs2015-07-061-2/+10
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Favor streams that had packetsMichael Niedermayer2015-07-011-1/+1
| | | | | | Fixes Thailand-Wave.wmv without explicitly specifying a stream Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status