summaryrefslogtreecommitdiff
path: root/ffmpeg_opt.c
Commit message (Collapse)AuthorAge
* 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>
* Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'Michael Niedermayer2015-05-02
| | | | | | | | | | | * 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-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035'Michael Niedermayer2015-04-04
| | | | | | | | | | * 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-02
| | | | | | | -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-28
| | | | | | | 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-26
|
* ffmpeg_opt: Add missing MATCH_PER_TYPE_OPT() for data codecsMichael Niedermayer2015-02-18
| | | | | | Fixes: CID1270809 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '81688e68f93f3142e2093f1a3d226edaeb179992'Michael Niedermayer2015-02-17
| | | | | | | | | | | * 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-15
| | | | | | | | 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-04
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: allow overriding and amending AVStream->dispositionMichael Niedermayer2015-01-25
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: expand format for strftimeChristophe Gisquet2015-01-24
| | | | | | | 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-16
| | | | | | | 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-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Check for av_realloc_array() failureMichael Niedermayer2015-01-07
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Use av_realloc_array()Michael Niedermayer2015-01-07
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add sdp_file optionSimon Thelen2014-12-28
| | | | | | | | | 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-19
| | | | | | | | | | | | * 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-30
| | | | | | | | | | | | | 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-27
| | | | | | | | | 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>
* ffmpeg_opt: use codec private context in ffserver streamsLukasz Marek2014-11-16
| | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* Set -scan_all_pmts 1 in ffmpeg, ffplay and ffprobe if not set by user.Carl Eugen Hoyos2014-11-09
| | | | Fixes ticket #3762.
* ffmpeg_opt: free incorrect priv_data for feed streamLukasz Marek2014-11-08
| | | | | | | | | new_output_stream creates a codec context with arbitraty picked codec. Later data is updated, but priv_data are left alone. There is a bit chance there is a mismatch between codecs. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc: clarify -frames options behaviorLou Logan2014-11-04
| | | | | | | | | Replace "frames to record" with "frames to output". The "to record" makes it seem like an input option, or that it would capture the frames instead of outputting them. Reviewed-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Lou Logan <lou@lrcd.com>
* ffmpeg_opt: store canvas size in decoder contextMichael Niedermayer2014-11-04
| | | | | | | Fixes canvas size Fixes Ticket4074 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Check the return code from strftime()Michael Niedermayer2014-10-26
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Print an error if -r and -vsync 0 are used together.Carl Eugen Hoyos2014-10-23
| | | | Fixes ticket #4041.
* ffmpeg_opt: Add -start_at_zero option.Rodger Combs2014-10-21
| | | | | | | This automatically shifts input timestamps to start at 0 instead of the file's starting timestamp when using -copyts. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: abort if -to <= -ssSimon Thelen2014-10-11
| | | | | | | | | Makes ffmpeg abort instead of continuing when stop_time <= start_time. Closes ticket #4015. Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add vdpau_old to allow continued testing of the older (but not ↵Michael Niedermayer2014-10-06
| | | | | | oldest) API Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavu/ffmpeg_opt: Check return value of avcodec_find_encoder().Thilo Borgmann2014-09-25
| | | | | | | | Prevents a segfault if a stream featuring a known but unavailable codec (like external lib codec) should be opened. Bug found by: Jonas Geistert <j.geistert@yahoo.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: reduce diff to libav in opt_target() by 16 linesMichael Niedermayer2014-08-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5'Michael Niedermayer2014-08-27
| | | | | | | * commit 'f5245a9c6206878b892adf3ccbccc9311c202af5': avconv: fix parsing the AVOptions for -target Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Use new av_dict_set_int helper function.Reimar Döffinger2014-08-16
| | | | | | | Get rid of the many, slightly differing, implementations of basically the same thing. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* ffmpeg: look for encoding options in both avcodec and avformatClément Bœsch2014-08-15
| | | | | | This patch is the same as 8a1714ad85dd5defdf1fb2baba9ababebfa47d01 but applied to encoding. It fixes the current clash of the -password option between tta decoder and the icecast protocol.
* ffmpeg: remove 32 channel limit from audio_channels_mapMichael Niedermayer2014-08-15
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Do not automatically map subtitles if the decoder and encoder properties are ↵Carl Eugen Hoyos2014-08-07
| | | | | | different. Fixes ticket #3819.