summaryrefslogtreecommitdiff
path: root/ffmpeg_opt.c
Commit message (Collapse)AuthorAge
* 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.
* ffmpeg: Do not fail if a demuxer and decoder use the same option identiferMichael Niedermayer2014-08-04
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Use av_guess_codec() instead of AVOutputFormat->*codecMichael Niedermayer2014-08-02
| | | | | | Fixes part of ticket2236 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'dc71f1958846bb1d96de43a4603983dc8450cfcc'Michael Niedermayer2014-07-29
| | | | | | | * commit 'dc71f1958846bb1d96de43a4603983dc8450cfcc': video4linux2: Avoid a floating point exception Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: remove intra_dc_precision, its handled by AVOptionsMichael Niedermayer2014-07-15
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: route -ab to -b:aMichael Niedermayer2014-06-29
| | | | | | | Fixes combining -ab with -target pal-dvd Fixes Ticket3736 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Dont exit on avformat_find_stream_info() failure if there are ↵Michael Niedermayer2014-06-18
| | | | | | | | | streams This allows "-codec copy -f framecrc" on files with only unindentifyable streams Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: support setting AVStream.discardMichael Niedermayer2014-06-07
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: remove unused variable and undocumented and not working command ↵Michael Niedermayer2014-06-07
| | | | | | line option Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: fix ffserver with the 2 encoder contextsMichael Niedermayer2014-06-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding contextMichael Niedermayer2014-06-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: fix attachment streamsMichael Niedermayer2014-06-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d'Michael Niedermayer2014-06-01
| | | | | | | | | | | * commit '383136264ef40452efd86cafb2d7221cd3830b3d': avconv: do not use the stream codec context for encoding Conflicts: ffmpeg.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'Michael Niedermayer2014-06-01
| | | | | | | | | | | | * commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5': avconv: do not use the stream codec context for decoding Conflicts: ffmpeg.c ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: use av_stream_get_end_pts()Michael Niedermayer2014-05-21
| | | | | | Simplifies code and should correct timing values when -*sync drop is used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: dont copy "encoder" metadata unless stream copy is usedMichael Niedermayer2014-05-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add last_mux_dts_plus_durationMichael Niedermayer2014-05-19
| | | | | | | Fixes 1 frame error in the duration and derived values, introduced by not using AVStream.pts in the previous commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'Michael Niedermayer2014-05-12
| | | | | | | | | | * commit '1839fafa951308237c4672ffd9a94f927b26eac7': avconv: Support VDA hwaccel Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '9580818c5d934bde65a95efd2cee61c174721092'Michael Niedermayer2014-05-05
| | | | | | | | | | | * commit '9580818c5d934bde65a95efd2cee61c174721092': avconv: rename OutputStream.opts to OutputStream.encoder_opts Conflicts: ffmpeg.c ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'Michael Niedermayer2014-05-05
| | | | | | | | | | * commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66': avconv: rename InputStream.opts to InputStream.decoder_opts Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>