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

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-09-10ffmpeg: check for unsupported "queing of command on first filter supporting ↵Michael Niedermayer
the specific commend" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-10ffmpeg: improve built in docs for passing commandsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-10ffmpeg: print command replies starting on column 0Michael Niedermayer
This fixes formating issues with multi-line replies Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-19Warn the user if a pix_fmt != yuv420p was chosen for MPEG-2 video encoding.Carl Eugen Hoyos
Fixes ticket #2870.
2013-08-06Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'Michael Niedermayer
* commit '488a0fa68973d48e264d54f1722f7afb18afbea7': avconv: support -t as an input option. Conflicts: Changelog ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'Michael Niedermayer
* commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8': avconv: distinguish between -ss 0 and -ss not being used Conflicts: ffmpeg.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-01ffmpeg: raise level for message printed in case of auto-select pixel formatStefano Sabatini
Increase visibility, in order to decrease troubleshooting for users generating non playable H.264 content. Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-07-08Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'Michael Niedermayer
* commit '636ced8e1dc8248a1353b416240b93d70ad03edb': cmdutils: wrap exit explicitly Conflicts: avprobe.c cmdutils.c ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-30ffmpeg: Don't include colorspace.hDerek Buitenhuis
The header is private, and ffmpeg.c doesn't use it for anything. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-06-23Merge commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790'Michael Niedermayer
* commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790': avconv: report the error for codec open failure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-23Merge commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f'Michael Niedermayer
* commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f': avconv: drop additional strerror fallback Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-05Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c'Michael Niedermayer
* commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c': avconv: check that the output format context exists before accessing it Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-03ffmpeg: ignore EOF when pushing frames to filters.Nicolas George
EOF is not a fatal condition, it is normally produced by a few filters. TODO: take it into account to avoid useless decoding.
2013-05-29ffmpeg: use actual packet pts when discarding for the copypriorss optionJustin Ruggles
The ist->pts value at this point does not necessarily match the actual packet pts, which is what should be used to decide whether to discard the packet. Without this change, some video packets that have pts on or after the start time are getting discarded when they should not be. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-05-28Merge commit '538bf767373f176b6487e30181155e74b37cced6'Michael Niedermayer
* commit '538bf767373f176b6487e30181155e74b37cced6': avconv: make -aspect work with streamcopy Conflicts: ffmpeg.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15ffmpeg: free threads on error conditions.Michael Niedermayer
Fixes Ticket2562 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-09ffmpeg: add -apad option which injects a apad filter only in the presence of ↵Michael Niedermayer
video streams Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-09ffmpeg: use av_freep() for forced_kf_ptsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03ffmpeg: drop old non monotone dts workaround.Michael Niedermayer
All bugs should now be fixed in the new so the old can be droped. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03ffmpeg: set correct log context for non monotone dts workaround warningsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03ffmpeg: port loglevel selection code to new dts workaround codeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03ffmpeg: fix pts handling in the non monotone dts workaroundMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03ffmpeg: fix the used maximum dts in the monotone dts workaroundMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03ffmpeg: use a max variable to hold the maximum dtsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03ffmpeg: Check dts before use in non monotone dts workaroundMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03ffmpeg: limit non monotone workaround to audio & video streamsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03ffmpeg: move non monotone prevention code downMichael Niedermayer
This moves the code to after the bitstream filters Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avconv: do not send non-monotonous DTS to the muxers. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03Merge commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe'Michael Niedermayer
* commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe': avconv: improve -re implementation Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02ffmpeg: fix segfault with random outputMichael Niedermayer
Found-by: <durandal_1707> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a'Michael Niedermayer
* commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a': avconv: make output -ss insert trim/atrim filters. Conflicts: Changelog ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01Merge commit 'a83c0da539fb07260310bc3b34056239d2b138b2'Michael Niedermayer
* commit 'a83c0da539fb07260310bc3b34056239d2b138b2': avconv: make -t insert trim/atrim filters. The filter insertion code is merged but disabled as it is buggy. For example it fails in various ways when used with -s with some files. Also the trimming is arguably less accurate than the default without filters in some cases. These issues should be fixed before auto inserting the filters, until then the user can explicitly add a trim/atrim filter when one is wanted. Conflicts: Changelog ffmpeg.c ffmpeg_filter.c tests/ref/fate/bethsoft-vid tests/ref/lavf/aiff tests/ref/lavf/asf tests/ref/lavf/au tests/ref/lavf/avi tests/ref/lavf/dpx tests/ref/lavf/ffm tests/ref/lavf/gxf tests/ref/lavf/jpg tests/ref/lavf/mkv tests/ref/lavf/mmf tests/ref/lavf/mov tests/ref/lavf/mpg tests/ref/lavf/nut tests/ref/lavf/ogg tests/ref/lavf/pcx tests/ref/lavf/png tests/ref/lavf/rm tests/ref/lavf/ts tests/ref/lavf/voc tests/ref/lavf/voc_s16 tests/ref/lavf/wav Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-19ffmpeg: make -aspect work with -vcodec copy.Nicolas George
2013-04-14ffmpeg: show error message in case of av_buffersrc_add_frame_flags() failureStefano Sabatini
2013-04-12Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'Michael Niedermayer
* commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da': lavfi: change the filter registering system to match the other libraries Conflicts: cmdutils.c ffplay.c libavfilter/avfilter.c libavfilter/avfilter.h This removes the ability to put AVFilters in read only memory and having them shareable. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'Michael Niedermayer
* commit '38f0c0781a6e099f11c0acec07f9b8be742190c4': lavfi: merge avfiltergraph.h into avfilter.h Conflicts: doc/APIchanges ffmpeg_filter.c libavfilter/avfilter.h libavfilter/avfiltergraph.h libavfilter/version.h tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10ffmpeg: update error message, and make use of av_err2str() to simplifyStefano Sabatini
2013-04-10Merge remote-tracking branch 'cigaes/master'Michael Niedermayer
* cigaes/master: ffmpeg: use a rational for -aspect option. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10ffmpeg: print frame decoding error statisticMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10ffmpeg: dont exit 0 if fewer than 1/3 of the input could be decoded.Michael Niedermayer
Fixes Ticket2405 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-09ffmpeg: use a rational for -aspect option.Nicolas George
2013-04-04Add a work-around for msvc compilation until c99-to-c89 issue 7 is fixed.Carl Eugen Hoyos
Tested-by: Nevcairiel
2013-04-02ffmpeg: Fix forcing of the framerate for stream copy on inputMichael Niedermayer
Fixes Ticket2211 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-01ffmpeg: initialize got_output, this silences a compiler warning from iccMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'Michael Niedermayer
* commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c': lavfi/gradfun: remove rounding to match C and SSE code. lavfi/gradfun: fix dithering in MMX code. lavfi/gradfun: fix rounding in MMX code. lavfi/gradfun: do not increment DC pointer for odd values. fate: filter: Add dependencies avconv: add options for reading filtergraphs from a file. Conflicts: Changelog doc/ffmpeg.texi doc/filters.texi ffmpeg.h ffmpeg_opt.c libavfilter/vf_gradfun.c tests/fate/filter.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23Call do_video_stats when duplicating frameThierry Foucu
When multiple frame are encoded during vsync, current code only do_video_stats once. This need to do it every frame. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23ffmpeg: Correct inter stream timestamp discontinuitiesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-21ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with ↵Michael Niedermayer
yadif injection Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-21ffmpeg: fix freeing of sub2video frame.Nicolas George
2013-03-19Inform the user if a pix_fmt != yuv420p was chosen for x264 encoding.Carl Eugen Hoyos