summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
* Merge commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56'Michael Niedermayer2015-03-10
|\ | | | | | | | | | | | | * 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-03
| | | | | | | | See 3734c3ea51ae002a85366ee52dbc8f9df4cfd3db
* | ffmpeg: Fix -vstats when coded_frame is not setMichael Niedermayer2015-02-28
| | | | | | | | | | | | 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-26
| | | | | | | | 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-26
| |
* | ffmpeg: Print negative times like "-00:05:01.22" instead of "00:-5:-1.-22"Michael Niedermayer2015-02-11
| | | | | | | | 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: remove unused headerPaul B Mahol2015-01-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffmpeg: free_input_threads requires HAVE_PTHREADSChristophe Gisquet2015-01-30
| | | | | | | | | | | | | | 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-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Reduce noisiness of frame clipping in rate convertionMichael Niedermayer2015-01-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Favor filter graph based duration over ost->frame_rate in fps codeMichael Niedermayer2015-01-19
| | | | | | | | | | | | 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-16
| | | | | | | | | | 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-16
| | | | | | | | | | | | | | | | 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-16
| | | | | | | | | | | | | | | | | | | | | | | | 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-16
| | | | | | | | 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: Add bitrate value under -progress actionraxon1s2015-01-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: remove unneeded NULL pointer checkMichael Niedermayer2015-01-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Clear error message array at init.Michael Niedermayer2015-01-08
| | | | | | | | | | | | 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-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Use av_freep(), avoid leaving stale pointers in memoryMichael Niedermayer2014-12-28
| | | | | | | | 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>
* | ffmpeg: Check for subtitle_out malloc failureMichael Niedermayer2014-12-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: forward r_frame_rate to the muxer in case of stream copyMichael Niedermayer2014-12-14
| | | | | | | | | | | | Fixes Ticket3629 part2 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: drop usage of coded_frameMichael Niedermayer2014-12-03
| | | | | | | | | | | | | | It causes all kinds of problems and there is no code in the muxers that reads this field Signed-off-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: Print a debug message if the frame parameters mismatch the contextMichael Niedermayer2014-11-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: skip duration cliping for passthrough & drop modesMichael Niedermayer2014-11-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Check duration for overlap and clip in fps cfr/vfr codeMichael Niedermayer2014-11-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Use input packet duration in vfr/cfr code if available and validMichael Niedermayer2014-11-19
| | | | | | | | Fixes Ticket3052
* | ffmpeg: fix printed timestamp for droped framesMichael Niedermayer2014-11-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: better CFR frame duplication selectionMichael Niedermayer2014-11-19
| | | | | | | | | | | | | | | | | | This improves the handling of cases where the frame duration is not known Fixes Ticket 4119 Fixes Ticket 1578 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix variable type for end charMichael Niedermayer2014-11-19
| | | | | | | | | | | | fixes warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Fix last newline at log level less than "info"Michael Niedermayer2014-11-17
| | | | | | | | | | | | Fixes Ticket3058 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '88b32673db39440422a73ec3047d3326c96b4fb2'Michael Niedermayer2014-10-24
|\| | | | | | | | | | | | | * commit '88b32673db39440422a73ec3047d3326c96b4fb2': avconv: copy stream-level side data when streamcopying Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f'Michael Niedermayer2014-10-24
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f': avconv: Use av_gettime_relative Conflicts: ffmpeg.c See: 76191c08f88fd66cf9198afc0c4a809c4c0336d4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: avoid endlessly reading from one input while another is unavailableMichael Niedermayer2014-10-22
| | | | | | | | | | | | | | Testcase in Ticket 4051 Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | * commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283': lavc: deprecate unused me_threshold field Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a': avconv: check return value Conflicts: ffmpeg.c See: 4930cd13d634d5f4e284de3a955d5c6a84fd65e2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '557d4c4ecae080729e68df54ed2bd8420d0f037a'Michael Niedermayer2014-10-15
|\| | | | | | | | | | | | | | | | | | | * commit '557d4c4ecae080729e68df54ed2bd8420d0f037a': avconv: replace AVCodecContext.time_base with framerate Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Fix stream copy with initial_paddingMichael Niedermayer2014-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8'Michael Niedermayer2014-09-27
|\| | | | | | | | | | | | | | | | | | | * commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8': avconv: Use only audio and video to guess discontinuities Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: replace impossible dts/pts combinations by a reasonable guess ↵Michael Niedermayer2014-09-23
| | | | | | | | | | | | | | | | instead of hard failing Fixes stream copy from tserror270.ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph ↵Michael Niedermayer2014-09-11
| | | | | | | | | | | | | | | | not just when changing audio resample parameters Fixes Ticket3562 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Copy extradata if it has been initialized later from the encoderMichael Niedermayer2014-09-07
| | | | | | | | | | | | Fixes Ticket3909 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Enable compute_edt only when the subtitles are used for a output ↵Michael Niedermayer2014-09-01
| | | | | | | | | | | | | | | | | | stream instead of a filter Fixes/works around Ticket3768 Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dvbsubdec: make compute_edt user settableMichael Niedermayer2014-09-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Fix missing {} in Stream to Packet side data codeMichael Niedermayer2014-08-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Drop remaining unneeded != NULLMichael Niedermayer2014-08-15
| | | | | | | | | | Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>