aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'Michael Niedermayer2015-07-211-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370': Deprecate avctx.coded_frame Conflicts: ffmpeg.c libavcodec/a64multienc.c libavcodec/asvenc.c libavcodec/cljrenc.c libavcodec/dpxenc.c libavcodec/gif.c libavcodec/mpegvideo_enc.c libavcodec/nvenc.c libavcodec/proresenc_kostya.c libavcodec/pthread_frame.c libavcodec/rawenc.c libavcodec/sunrastenc.c libavcodec/tiffenc.c libavcodec/version.h libavcodec/xbmenc.c libavcodec/xwdenc.c libavdevice/v4l2.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'Michael Niedermayer2015-07-211-3/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5d3addb937946eca5391e40b5e6308e74ac6f77b': Add a quality factor packet side data Conflicts: doc/APIchanges ffmpeg.c libavcodec/avcodec.h libavcodec/mpegvideo_enc.c libavcodec/version.h Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'Michael Niedermayer2015-07-191-5/+0
|\| | | | | | | | | | | | | | | | | | | | | * 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 '1959351aecf09fc3e90208ff775f4849801dc13f'Michael Niedermayer2015-07-191-10/+0
|\| | | | | | | | | | | | | * commit '1959351aecf09fc3e90208ff775f4849801dc13f': avconv: move the no streams failure to open_output_file() Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'ab7b038906f3e40ed474676d8e3029902a2078f5'Michael Niedermayer2015-07-191-57/+68
|\| | | | | | | | | | | | | | | | | | | * commit 'ab7b038906f3e40ed474676d8e3029902a2078f5': avconv: factor out the output stream initialization Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '6d5d9246042acb804a652e6fedfb7afe0ca85614'Michael Niedermayer2015-07-191-35/+0
|\| | | | | | | | | | | | | | | | | | | * 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-4/+0
|\| | | | | | | | | | | | | | | | | | | * commit '59245e0c5e10a849e67c632cccf4f677b2442e82': avconv: set the encoding/decoding_needed flags earlier Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Fix cleanup after failed allocation of output_filesMichael Niedermayer2015-07-141-1/+4
| | | | | | | | | | | | | | Fixes: 39a25908b84604acdaa490138282d091_signal_sigsegv_7ffff713351a_331_WAWV.avi with memlimit of 262144 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Fix crash with ost->last_frame allocation failureMichael Niedermayer2015-07-141-1/+1
| | | | | | | | | | | | | | Fixes: 1013dbde2c360d939cc2dfc33e4f275c_signal_sigsegv_a0500f_45_320vp3.nsv with memlimit of 536870912 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Fix deallocating input threads with partly failed file allocationMichael Niedermayer2015-07-141-1/+1
| | | | | | | | | | | | | | Fixes: 18615ff56beedc63a884a8db0678b47c_signal_sigsegv_7ffff713351a_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 524288 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Fix cleanup with ost = NULLMichael Niedermayer2015-07-131-1/+6
| | | | | | | | | | | | | | Fixes: 09e670595acbdafb226974b08dab66e3_signal_sigabrt_7ffff70eccc9_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 1048576 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Use av_log to print benchmark output.Carl Eugen Hoyos2015-07-091-3/+3
| |
* | ffmpeg: windows: respond to logoff and ctrl+break messages as wellrogerdpack2015-07-011-0/+41
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: only count got_output/errors in decode_error_statAndreas Cadhalpun2015-07-011-3/+3
| | | | | | | | | | | | | | | | | | If threading is used, the first (thread_count - 1) packets are read before any frame/error is returned. Counting this as successful decoding is wrong, because it also happens when no single frame could be decoded. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | ffmpeg: exit_on_error if decoding a packet failedAndreas Cadhalpun2015-07-011-0/+9
| | | | | | | | | | | | | | This is the second part of the fix for ticket #4370. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | Merge commit '9a5e4fbec870c7d466b7a0aec92c70778efc96b5'Michael Niedermayer2015-06-271-9/+8
|\| | | | | | | | | | | | | | | | | | | * commit '9a5e4fbec870c7d466b7a0aec92c70778efc96b5': avconv: do not stop processing the input packet on decoding error Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b114f6d48a06a4dad6882bc83e07463905f004c4'Michael Niedermayer2015-06-271-21/+27
|\| | | | | | | | | | | | | | | | | | | * commit 'b114f6d48a06a4dad6882bc83e07463905f004c4': avconv: factor out flushing the filters Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Use 2 instead of STDERR_FILENOMichael Niedermayer2015-06-251-2/+3
| | | | | | | | | | | | STDERR_FILENO is not available on windows Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | modify exit message when signaledrogerdpack2015-06-251-1/+1
| | | | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: log error message when shutting down from too many signalsrogerdpack2015-06-251-1/+4
| | | | | | | | | | write() suggested by wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Do not use the data/size of a bitstream filter after failureMichael Niedermayer2015-06-241-0/+1
| | | | | | | | | | Found-by: Rodger Combs Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Free last_frame instead of just unrefMichael Niedermayer2015-06-181-0/+2
| | | | | | | | | | | | Fixes Ticket4611 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: do not print misleading recommanditions on 1pass vpx encodingMichael Niedermayer2015-05-261-1/+10
| | | | | | | | | | | | Fixes part of Ticket4295 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Support copying unknown streamsMichael Niedermayer2015-05-211-0/+1
| | | | | | | | 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-1/+5
| | | | | | | | | | | | Fixes Ticket4560 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: only apply last picture flush code at EOFMichael Niedermayer2015-05-171-1/+1
| | | | | | | | | | | | Fixes Ticket4562 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Support preserving the source key frame timingsanatolschwarz2015-05-161-1/+8
| | | | | | | | Added option "source" to force_key_frames
* | ffmpeg: Remove another unneeded ost->filter_graph checkMichael Niedermayer2015-05-151-1/+1
| | | | | | | | | | | | Fixes CID1241508 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Print an error if avfilter_graph_queue_command() failedMichael Niedermayer2015-05-151-0/+2
| | | | | | | | | | | | Fixes CID1271809 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: remove unneeded ost->filter checkMichael Niedermayer2015-05-151-1/+1
| | | | | | | | | | | | Fixes CID1241508 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'Michael Niedermayer2015-05-021-0/+2
|\| | | | | | | | | | | | | | | | | | | | | * 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: remove incorrect network deinitMichael Niedermayer2015-04-281-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Fix null pointer dereference in do_video_out()Michael Niedermayer2015-04-191-0/+3
| | | | | | | | | | | | Fixes: CID1295087 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035'Michael Niedermayer2015-04-041-13/+15
|\| | | | | | | | | | | | | | | | | | | * commit '3892bdab9b652eb003ab95e167f1765e0b0ea035': avconv: do not overwrite the stream codec context for streamcopy Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Fix extradata allocationMichael Niedermayer2015-04-041-4/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Fix indentationMichael Niedermayer2015-04-031-66/+66
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: last frame duplication heuristicMichael Niedermayer2015-04-031-5/+24
| | | | | | | | | | | | | | | | | | This improves the last frames duration with CFR and when the input durations are inaccurate or missing Fixes Ticket4119 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Avoid null pointer dereferencesHimangi Saraogi2015-04-021-2/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995'Michael Niedermayer2015-03-201-3/+7
|\| | | | | | | | | | | | | | | | | | | * commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995': avconv: Print the avfilter errors Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56'Michael Niedermayer2015-03-101-1/+1
|\| | | | | | | | | | | | | * commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56': avconv: do not abort immediately if initializing hwaccel fails Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: comment mpeg4 hackClément Bœsch2015-03-031-0/+1
| | | | | | | | See 3734c3ea51ae002a85366ee52dbc8f9df4cfd3db
* | ffmpeg: Fix -vstats when coded_frame is not setMichael Niedermayer2015-02-281-3/+3
| | | | | | | | | | | | There are several encoders which do not set coded_frame Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: notify when the thread message queue blocks.Nicolas George2015-02-261-1/+10
| | | | | | | | This can help finding the source of A-V desync with live input.
* | ffmpeg: allow to set the thread message queue size.Nicolas George2015-02-261-1/+1
| |
* | ffmpeg: Print negative times like "-00:05:01.22" instead of "00:-5:-1.-22"Michael Niedermayer2015-02-111-2/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Make CFR frame drop threshold user adjustableMichael Niedermayer2015-02-041-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: remove unused headerPaul B Mahol2015-01-301-2/+0
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffmpeg: free_input_threads requires HAVE_PTHREADSChristophe Gisquet2015-01-301-1/+2
| | | | | | | | | | | | | | Hide behind that macro to avoid warning on systems with !HAVE_PTHREADS. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: allow overriding and amending AVStream->dispositionMichael Niedermayer2015-01-251-0/+32
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Reduce noisiness of frame clipping in rate convertionMichael Niedermayer2015-01-191-1/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 10:19:32 +0000