Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-01-16ffmpeg: improve data stream supportAnshul Maheshwari
This adds data codec/stream handling where previously there was only audio/video/subtitles Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-08ffmpeg_opt: Use avio_closep() to avoid leaving stale pointers in memoryMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-07ffmpeg_opt: Check for av_realloc_array() failureMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-07ffmpeg_opt: Use av_realloc_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-28ffmpeg: add sdp_file optionSimon Thelen
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>
2014-12-19Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e'Michael Niedermayer
* commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e': check memory errors from av_strdup() Conflicts: avprobe.c libavformat/matroskaenc.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-30ffmpeg: take bsf arguments from the command lineChristophe Gisquet
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>
2014-11-28ffmpeg_opt: make use of recommended encoder configurationLukasz Marek
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>
2014-11-16ffmpeg_opt: use codec private context in ffserver streamsLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-09Set -scan_all_pmts 1 in ffmpeg, ffplay and ffprobe if not set by user.Carl Eugen Hoyos
Fixes ticket #3762.
2014-11-08ffmpeg_opt: free incorrect priv_data for feed streamLukasz Marek
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>
2014-11-05doc: clarify -frames options behaviorLou Logan
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>
2014-11-04ffmpeg_opt: store canvas size in decoder contextMichael Niedermayer
Fixes canvas size Fixes Ticket4074 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-26ffmpeg_opt: Check the return code from strftime()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24Print an error if -r and -vsync 0 are used together.Carl Eugen Hoyos
Fixes ticket #4041.
2014-10-21ffmpeg_opt: Add -start_at_zero option.Rodger Combs
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>
2014-10-12ffmpeg_opt: abort if -to <= -ssSimon Thelen
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>
2014-10-06ffmpeg: add vdpau_old to allow continued testing of the older (but not ↵Michael Niedermayer
oldest) API Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25lavu/ffmpeg_opt: Check return value of avcodec_find_encoder().Thilo Borgmann
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>
2014-08-27ffmpeg_opt: reduce diff to libav in opt_target() by 16 linesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27Merge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5'Michael Niedermayer
* commit 'f5245a9c6206878b892adf3ccbccc9311c202af5': avconv: fix parsing the AVOptions for -target Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16Use new av_dict_set_int helper function.Reimar Döffinger
Get rid of the many, slightly differing, implementations of basically the same thing. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-16ffmpeg: look for encoding options in both avcodec and avformatClément Bœsch
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.
2014-08-15ffmpeg: remove 32 channel limit from audio_channels_mapMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07Do not automatically map subtitles if the decoder and encoder properties are ↵Carl Eugen Hoyos
different. Fixes ticket #3819.
2014-08-04ffmpeg: Do not fail if a demuxer and decoder use the same option identiferMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02ffmpeg_opt: Use av_guess_codec() instead of AVOutputFormat->*codecMichael Niedermayer
Fixes part of ticket2236 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29Merge commit 'dc71f1958846bb1d96de43a4603983dc8450cfcc'Michael Niedermayer
* commit 'dc71f1958846bb1d96de43a4603983dc8450cfcc': video4linux2: Avoid a floating point exception Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-15ffmpeg_opt: remove intra_dc_precision, its handled by AVOptionsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-29ffmpeg_opt: route -ab to -b:aMichael Niedermayer
Fixes combining -ab with -target pal-dvd Fixes Ticket3736 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18ffmpeg_opt: Dont exit on avformat_find_stream_info() failure if there are ↵Michael Niedermayer
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>
2014-06-07ffmpeg: support setting AVStream.discardMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07ffmpeg_opt: remove unused variable and undocumented and not working command ↵Michael Niedermayer
line option Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01ffmpeg_opt: fix ffserver with the 2 encoder contextsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding contextMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01ffmpeg_opt: fix attachment streamsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d'Michael Niedermayer
* 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>
2014-06-01Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'Michael Niedermayer
* 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>
2014-05-21ffmpeg: use av_stream_get_end_pts()Michael Niedermayer
Simplifies code and should correct timing values when -*sync drop is used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20ffmpeg_opt: dont copy "encoder" metadata unless stream copy is usedMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19ffmpeg: add last_mux_dts_plus_durationMichael Niedermayer
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>
2014-05-12Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'Michael Niedermayer
* commit '1839fafa951308237c4672ffd9a94f927b26eac7': avconv: Support VDA hwaccel Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05Merge commit '9580818c5d934bde65a95efd2cee61c174721092'Michael Niedermayer
* commit '9580818c5d934bde65a95efd2cee61c174721092': avconv: rename OutputStream.opts to OutputStream.encoder_opts Conflicts: ffmpeg.c ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'Michael Niedermayer
* commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66': avconv: rename InputStream.opts to InputStream.decoder_opts Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'Michael Niedermayer
* commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a': configure: rework dxva in avconv handling Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'Michael Niedermayer
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a': avconv: add support for DXVA2 decoding Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16ffmpeg_opt: check that a subtitle encoder is available before auto mapping ↵Michael Niedermayer
streams Fixes Ticket3470 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16ffmpeg_opt: Check ist is valid before using it in audio_channels_map initMichael Niedermayer
Fixes segfault and instead provides an error message Fixes Ticket3465 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-25ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code checkTimothy Gu
avio_open2() only return < 0 when error. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'Michael Niedermayer
* commit '746dca483a2f0f2639265f6e1c0085c8861875a1': avconv: support forcing codec tags for input streams Conflicts: doc/ffmpeg.texi See: 6bca574a98ba604459f6ee92538b19d25bba0973 Merged-by: Michael Niedermayer <michaelni@gmx.at>