aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
* ffmpeg: Don't try and write sdp info if none of the outputs had an rtp format.Simon Thelen2015-11-121-0/+4
| | | | | | | | | | Fixes a segfault when trying to write nonexistent rtp information. Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 70fb5eadc580a82c4b977a1233d70ad0041faba0) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Use correct codec_id for av_parser_change() checkMichael Niedermayer2015-11-121-5/+4
| | | | | | | | | No testcase known Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 45f3d4e63e7807ff3d281f269625ed83f11e4cdc) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Check av_parser_change() for failureMichael Niedermayer2015-11-121-2/+7
| | | | | | | | | No testcase known Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit ac0ba6f233698f02ebb75b03242e94333dbe13d4) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Check for RAWVIDEO and do not relay only on AVFMT_RAWPICTUREMichael Niedermayer2015-11-121-1/+3
| | | | | | | | | | | The null muxer has AVFMT_RAWPICTURE set but can be fed with non-raw material related to Ticket4778 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit c8890941d63df786bb7a8cab92677416499bb7c3) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: check avpicture_fill() return valueMichael Niedermayer2015-11-121-1/+5
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 15ff3f3fdfc788c0e4e584badd7ec300abfbd716) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: only count got_output/errors in decode_error_statAndreas Cadhalpun2015-07-191-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> (cherry picked from commit bd0f14123fd8c7ff1c27b726d143f84c67f3a522) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* ffmpeg: exit_on_error if decoding a packet failedAndreas Cadhalpun2015-07-191-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> (cherry picked from commit cd64ead8d96b2d2c300e0ac620fb82b17d6051bf) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Conflicts: ffmpeg.c
* ffmpeg: Fix cleanup after failed allocation of output_filesMichael Niedermayer2015-07-181-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> (cherry picked from commit 6e80fe1ecd984a59bb6c73cbb436cc06536b7728) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Fix crash with ost->last_frame allocation failureMichael Niedermayer2015-07-181-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> (cherry picked from commit fd4c87fa3becaf8a6c480db915daf51e297b76c5) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Fix cleanup with ost = NULLMichael Niedermayer2015-07-181-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> (cherry picked from commit 503ec7139f887bf8ed8d57da07ce93c4e88447a6) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Do not use the data/size of a bitstream filter after failureMichael Niedermayer2015-07-181-0/+1
| | | | | | | | Found-by: Rodger Combs Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8f0f678f090d9939b0014ba85641e2cb83d39cb8) 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> (cherry picked from commit d1050d9950610aa2b27878b67bb2b902dd717e7c) 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>
* | ffmpeg: Favor filter graph based duration over ost->frame_rate in fps codeMichael Niedermayer2015-01-191-7/+4
| | | | | | | | | | | | The fate change adds a last frame with a subtitle not displayed in the previous Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix precission typosMichael Niedermayer2015-01-161-1/+1
| | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Use filter graph output frame rate also for frame duration estimationMichael Niedermayer2015-01-161-0/+8
| | | | | | | | | | | | | | | | Previously the duration was sometimes wrong, this addition limits the value and improves which frames are choosen when reducing the frame rate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Maintain higher precision pts between video filter and fps codeMichael Niedermayer2015-01-161-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | This is a bit ugly as it attempts to keep most of the computation in integers before the double based fps code. The use of integers is to reduce the chances of rounding differences between platforms Previously the timestamp was rounded to the encoder timebase before being converted back to double precision which could cause loss of precision Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: drop redundant frame_pts valueMichael Niedermayer2015-01-161-5/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: improve data stream supportAnshul Maheshwari2015-01-161-0/+2
| | | | | | | | | | | | | | This adds data codec/stream handling where previously there was only audio/video/subtitles Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Add bitrate value under -progress actionraxon1s2015-01-161-4/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: remove unneeded NULL pointer checkMichael Niedermayer2015-01-091-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Clear error message array at init.Michael Niedermayer2015-01-081-1/+1
| | | | | | | | | | | | This avoids printing uninitialized bytes if no error message is set Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Use avio_closep() to avoid leaving stale pointers in memoryMichael Niedermayer2015-01-081-4/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>