summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'Michael Niedermayer2014-05-181-0/+2
|\ | | | | | | | | | | | | | | | | | | * commit '93afb6c98df876b15e3d911a9450ad55f92080ce': avconv: set output avg_frame_rate when known Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: bitstream filters require split out side dataMichael Niedermayer2014-05-151-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use av_fifo_freepLukasz Marek2014-05-071-1/+1
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | Merge commit '9580818c5d934bde65a95efd2cee61c174721092'Michael Niedermayer2014-05-051-7/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '9580818c5d934bde65a95efd2cee61c174721092': avconv: rename OutputStream.opts to OutputStream.encoder_opts Conflicts: ffmpeg.c ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'Michael Niedermayer2014-05-051-1/+0
|\ \ | |/ | | | | | | | | | | * commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11': avconv: remove a useless line Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d'Michael Niedermayer2014-05-051-91/+91
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d': avconv: rename 'codec' to 'enc_ctx' Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '650a5206a944fd36a42d92f98e745972056b1f7c'Michael Niedermayer2014-05-051-48/+48
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '650a5206a944fd36a42d92f98e745972056b1f7c': avconv: rename 'icodec' to 'dec_ctx' Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'Michael Niedermayer2014-05-051-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66': avconv: rename InputStream.opts to InputStream.decoder_opts Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3'Michael Niedermayer2014-05-051-29/+38
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3': avconv: simplify exit_program() by using more local vars Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: put the sizeof() second in av_malloc_array()Michael Niedermayer2014-05-011-2/+2
| | | | | | | | | | | | This is purely a cosmetic change Suggested-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use av_malloc_array()Michael Niedermayer2014-05-011-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: dont print "Conversion failed" if conversion has never startedMichael Niedermayer2014-04-291-1/+1
| | | | | | | | | | Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: print an error at the end if conversion failedMichael Niedermayer2014-04-291-0/+2
| | | | | | | | | | | | Fixes Ticket3477 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1ae8198bca749a0cff205196cc83d35b9962849b'Michael Niedermayer2014-04-221-2/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '1ae8198bca749a0cff205196cc83d35b9962849b': avconv: always reset packet pts after decoding an audio frame Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix mixed merged & split side data with the stream->packet hackMichael Niedermayer2014-04-181-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: stop protocols on interrupt when no transcoding has happened yetMichael Niedermayer2014-04-101-1/+4
| | | | | | | | | | | | Fixes Ticket3344 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: frame droping due to fps should not be a warningMichael Niedermayer2014-04-041-1/+1
| | | | | | | | | | | | | | This reverts part of 41e7e46cac507e993af6d656c8d3672ba3f9e304 See: http://thread.gmane.org/gmane.comp.video.ffmpeg.user/51229 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'Michael Niedermayer2014-03-251-1/+3
|\ \ | |/ | | | | | | | | | | * commit 'aa499568afc01d59215eef7e5b14b949a9671afc': avconv: More descriptive message about framedrop Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: move packet deallocation into write_frameMichael Niedermayer2014-03-241-3/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-241-1/+2
|\ \ | |/ | | | | | | | | | | * qatar/master: avconv: don't warn on multiple frames per packet for codecs that expect it Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'Michael Niedermayer2014-03-241-1/+90
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '4754345027eb85cfa51aeb88beec68d7b036c11e': avconv: print verbose per-stream transcoding statistics Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a220b07b0f971f88213aef012aea51af2800be62'Michael Niedermayer2014-03-241-37/+42
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'a220b07b0f971f88213aef012aea51af2800be62': avconv: split printing the final statistics into a separate function Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2'Michael Niedermayer2014-03-241-30/+24
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'baeb59d89beda499688e528c6a269d2b255b66f2': avconv: rewrite output data size tracking Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f759f66e367bc62ed7738a51040f775b656a60d8'Michael Niedermayer2014-03-241-4/+8
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'f759f66e367bc62ed7738a51040f775b656a60d8': avconv: explicitly report when the muxing overhead is unknown Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9'Michael Niedermayer2014-03-241-0/+17
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9': avconv: add stream-global side data to the first demuxed packet Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: sub2video: send a last blank frame before closing.Nicolas George2014-03-231-0/+2
| | | | | | | | Fix trac ticket #3420.
* | ffmpeg: dont call exit_program() from a signal handerMichael Niedermayer2014-03-211-1/+1
| | | | | | | | | | | | This is unsafe and can deadlock amongth other things Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: try to avoid calling av_log() from sigterm_handler()Michael Niedermayer2014-03-201-3/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix printing INT64_MIN pts at the endMichael Niedermayer2014-03-161-1/+1
| | | | | | | | | | | | Fixes Ticket3427 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: dont try to run the subtitle encoder on non subtitle streamsMichael Niedermayer2014-03-031-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'Michael Niedermayer2014-02-241-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '67f2a688143b644f99360565a9f36c61a5f052e9': avconv: remove a write-only variable Conflicts: ffmpeg.c ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5c79d2e12d13959fc6aed92d102c25194a06de05'Michael Niedermayer2014-02-201-3/+7
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '5c79d2e12d13959fc6aed92d102c25194a06de05': avconv: Do not divide by zero Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: make reading packets from thread blocking.Nicolas George2014-02-201-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a packet is not ready on the input selected by ffmpeg, it will read from another input instead. If that happens repeatedly, frames will accumulate somewhere later in the processing to ensure streams synchronization. It can happen in particular when reading from a slow medium or an expensive lavfi filter graph. Make reading from normal demuxers on non-streamed data and from the lavfi pseudo-device blocking to avoid that. Should fix trac ticket #3079.
* | ffmpeg: reduce frame rate for mpeg4 to be within the spec limitsMichael Niedermayer2014-02-191-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix vstatsMichael Niedermayer2014-02-101-1/+3
| | | | | | | | | | Broken by: 394fb56c29eee7f4f8f0334d8b5d30d3c54ac703 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: tweak debug_ts logging and add more of itStefano Sabatini2014-02-021-6/+33
| | | | | | | | Help with debugging timestamp issues.
* | ffmpeg: print data size too in statisticMichael Niedermayer2014-01-311-1/+2
| | | | | | | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: also count data streams bytesMichael Niedermayer2014-01-301-2/+5
| | | | | | | | | | | | Fixes wrong error message about empty output file Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use intermediary variables in reap_filters, increase readabilityStefano Sabatini2014-01-261-12/+11
| |
* | ffmpeg: use av_err2str() macroStefano Sabatini2014-01-231-10/+3
| | | | | | | | Simplify.
* | ffmpeg: apply misc cosmetics to process_input() codeStefano Sabatini2014-01-231-16/+14
| |
* | ffmpeg: change ost->finished to an enumMichael Niedermayer2014-01-171-4/+4
| | | | | | | | | | Idea-by: ramiro Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: update statistics only when a packet is actually muxedMichael Niedermayer2014-01-171-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg/flush_encoders: dont mux packets once ost->finished has been setMichael Niedermayer2014-01-171-0/+4
| | | | | | | | | | | | Fixes muxing frames after av_interleaved_write_frame() failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: properly close down muxers on av_interleaved_write_frame() failureMichael Niedermayer2014-01-171-4/+15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: check ost->finished in check_output_constraints()Michael Niedermayer2014-01-171-0/+3
| | | | | | | | | | | | No testcase but it seems logic to stop when finished is set Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: check ost->finished in reap_filters()Michael Niedermayer2014-01-171-0/+4
| | | | | | | | | | | | This avoids finished output streams continuing to receive frames Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683'Michael Niedermayer2014-01-171-1/+10
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683': avconv: print a warning when falling back to default 25fps Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use timestamp from before and after the decoder to detect backward ↵Michael Niedermayer2013-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | moving dts for discontinuity detection This should make discontinuity detection more robust and detect more cases. Timestamps after the decoder can be delayed due to threads, timestamps before can be missing no testcase available/known Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | remuxing .opus files to .webm codec->delay must be copied tooJan Gerber2013-12-191-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status