summaryrefslogtreecommitdiffstats
path: root/ffmpeg_opt.c
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* ffmpeg_opt: Fix forcing fourccsMichael Niedermayer2015-07-011-0/+1
| | | | | | Fixes Ticket4682 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Fix sync_istMichael Niedermayer2015-06-261-0/+4
| | | | | | This code was lost in 2663540821ee010edc7a47316b00a4745aaf973c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Fix handling of creation_time nowMichael Niedermayer2015-06-211-0/+13
| | | | | | Fixes Ticket4495 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6'Michael Niedermayer2015-06-121-2/+4
| | | | | | | | | | | * 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-121-0/+3
| | | | | 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-251-9/+9
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Support copying unknown streamsMichael Niedermayer2015-05-211-1/+23
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: add missing space in error messageMichael Niedermayer2015-05-211-1/+1
| | | | | 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-211-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Give the user a hint on how to ignore unsupported streamsMichael Niedermayer2015-05-211-1/+5
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: support ignoring unsupported mapped streamsRodger Combs2015-05-211-2/+7
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Compensate for DTS/PTS difference in seeking when its based on DTSMichael Niedermayer2015-05-181-1/+14
| | | | | | 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-181-0/+4
| | | | | | Fixes Ticket4560 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Fix -timestamp parsingMichael Niedermayer2015-05-091-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: remove rotate metadata in case of autorotateMichael Niedermayer2015-05-021-1/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'Michael Niedermayer2015-05-021-0/+6
| | | | | | | | | | | * 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>
* ffmpeg: add option not to offset seek position by start timewm42015-04-201-1/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035'Michael Niedermayer2015-04-041-2/+2
| | | | | | | | | | * commit '3892bdab9b652eb003ab95e167f1765e0b0ea035': avconv: do not overwrite the stream codec context for streamcopy Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt.c: fix regression introduced in 5743095cTim Nicholson2015-04-021-1/+1
| | | | | | | -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>
* ffmpeg_opt: Do not overwrite output if there is no inputMichael Niedermayer2015-03-281-0/+15
| | | | | | | Fixes Ticket4254 Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: allow to set the thread message queue size.Nicolas George2015-02-261-0/+6
|
* ffmpeg_opt: Add missing MATCH_PER_TYPE_OPT() for data codecsMichael Niedermayer2015-02-181-0/+1
| | | | | | Fixes: CID1270809 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '81688e68f93f3142e2093f1a3d226edaeb179992'Michael Niedermayer2015-02-171-1/+3
| | | | | | | | | | | * commit '81688e68f93f3142e2093f1a3d226edaeb179992': avconv: Check rc_override memory allocation Conflicts: ffmpeg_opt.c See: 7efabffc2899b76688a40b4bd7c63370eb2d8ca8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Creating new data stream for output format contextAnshul Maheshwari2015-02-151-1/+9
| | | | | | | | Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com> if input codec Id match with expected data stream of output format context then only new stream with same codec id is created. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Make CFR frame drop threshold user adjustableMichael Niedermayer2015-02-041-0/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: allow overriding and amending AVStream->dispositionMichael Niedermayer2015-01-251-0/+6
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: expand format for strftimeChristophe Gisquet2015-01-241-1/+1
| | | | | | | While the shortened format specifiers are valid C99 ones, they are not supported by e.g. some Visual Studio runtimes (and thus mingw). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: improve data stream supportAnshul Maheshwari2015-01-161-0/+5
| | | | | | | This adds data codec/stream handling where previously there was only audio/video/subtitles Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Use avio_closep() to avoid leaving stale pointers in memoryMichael Niedermayer2015-01-081-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Check for av_realloc_array() failureMichael Niedermayer2015-01-071-1/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Use av_realloc_array()Michael Niedermayer2015-01-071-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add sdp_file optionSimon Thelen2014-12-281-0/+10
| | | | | | | | | Allow printing of sdp information to a file specified by -sdp_file This allows users to print sdp information when at least one of the outputs isn't an rtp stream. Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e'Michael Niedermayer2014-12-191-0/+2
| | | | | | | | | | | | * commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e': check memory errors from av_strdup() Conflicts: avprobe.c libavformat/matroskaenc.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: take bsf arguments from the command lineChristophe Gisquet2014-11-301-0/+4
| | | | | | | | | | | | | The format is now: -bsf:X filter1[=opt1=str1/opt2=str2],filter2 ie the parameters are appended after the filter name using '='. As ',' has been reserved already for the list of filters, '/' is just an example of token separation for now, but that could become part of the API to avoid each bsf using its own tokenization. The proper solution would be using AVOption, but this is overkill for now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: make use of recommended encoder configurationLukasz Marek2014-11-271-29/+12
| | | | | | | | | So far ffmpeg used recommended configuration only for codec priv options. ffmpeg will use now codec defaults and then apply recommended configuration for all options. Recommended configuration possibly contains minimal set of options to filful user configuration. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
OpenPOWER on IntegriCloud