summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
* ffmpeg: use av_stream_get_end_pts()Michael Niedermayer2014-05-21
| | | | | | Simplifies code and should correct timing values when -*sync drop is used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg/set_encoder_id: dont allocate encoder string if one is already setMichael Niedermayer2014-05-20
| | | | | | Fixes memleak Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: use av_fifo_alloc_arrayLukasz Marek2014-05-20
| | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* ffmpeg/do_video_stats: fix used timebaseMichael Niedermayer2014-05-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: set dts for subtitlesMichael Niedermayer2014-05-19
| | | | | | | dts is not optional, its required for muxing, previously it was set from AVStream.pts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add last_mux_dts_plus_durationMichael Niedermayer2014-05-19
| | | | | | | Fixes 1 frame error in the duration and derived values, introduced by not using AVStream.pts in the previous commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0'Michael Niedermayer2014-05-19
|\ | | | | | | | | | | | | | | | | | | * commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0': avconv: do not use poorly defined and undocumented AVStream.pts Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Use av_gettime_relative()Olivier Langlois2014-05-19
| | | | | | | | | | | | | | | | | | Whenever av_gettime() is used to measure relative period of time, av_gettime_relative() is prefered as it guarantee monotonic time on supported platforms. Signed-off-by: Olivier Langlois <olivier@trillion01.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: prefix encoder with "Lavc " in bitexact modeMichael Niedermayer2014-05-18
| | | | | | | | | | | | This avoids misleading encoder names like "encoder = prores" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Skip writing the version when -flags bitexact is usedMichael Niedermayer2014-05-18
| | | | | | | | | | | | Alternatively every fate test could be changed to pass both fflags and flags +bitexact Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'Michael Niedermayer2014-05-18
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '6656370b858329ca07a60a2de954d5e90daa0206': avconv: set the "encoder" tag when transcoding Conflicts: ffmpeg.c tests/ref/lavf/mkv tests/ref/seek/lavf-mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'Michael Niedermayer2014-05-18
|\| | | | | | | | | | | | | | | | | | | * 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-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use av_fifo_freepLukasz Marek2014-05-07
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | Merge commit '9580818c5d934bde65a95efd2cee61c174721092'Michael Niedermayer2014-05-05
|\| | | | | | | | | | | | | | | | | | | | | * 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-05
|\| | | | | | | | | | | | | * commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11': avconv: remove a useless line Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d'Michael Niedermayer2014-05-05
|\| | | | | | | | | | | | | | | | | | | * commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d': avconv: rename 'codec' to 'enc_ctx' Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '650a5206a944fd36a42d92f98e745972056b1f7c'Michael Niedermayer2014-05-05
|\| | | | | | | | | | | | | | | | | | | * commit '650a5206a944fd36a42d92f98e745972056b1f7c': avconv: rename 'icodec' to 'dec_ctx' Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'Michael Niedermayer2014-05-05
|\| | | | | | | | | | | | | | | | | | | * 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-05
|\| | | | | | | | | | | | | | | | | | | * 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-01
| | | | | | | | | | | | 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-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: dont print "Conversion failed" if conversion has never startedMichael Niedermayer2014-04-29
| | | | | | | | | | Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: print an error at the end if conversion failedMichael Niedermayer2014-04-29
| | | | | | | | | | | | Fixes Ticket3477 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1ae8198bca749a0cff205196cc83d35b9962849b'Michael Niedermayer2014-04-22
|\| | | | | | | | | | | | | | | | | | | * 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-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: stop protocols on interrupt when no transcoding has happened yetMichael Niedermayer2014-04-10
| | | | | | | | | | | | Fixes Ticket3344 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: frame droping due to fps should not be a warningMichael Niedermayer2014-04-04
| | | | | | | | | | | | | | 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-25
|\| | | | | | | | | | | | | * commit 'aa499568afc01d59215eef7e5b14b949a9671afc': avconv: More descriptive message about framedrop Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: move packet deallocation into write_frameMichael Niedermayer2014-03-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | * 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-24
|\| | | | | | | | | | | | | | | | | | | * 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-24
|\| | | | | | | | | | | | | | | | | | | * 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-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-24
|\| | | | | | | | | | | | | | | | | | | * 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-24
|\| | | | | | | | | | | | | | | | | | | * 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-23
| | | | | | | | Fix trac ticket #3420.
* | ffmpeg: dont call exit_program() from a signal handerMichael Niedermayer2014-03-21
| | | | | | | | | | | | 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-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix printing INT64_MIN pts at the endMichael Niedermayer2014-03-16
| | | | | | | | | | | | Fixes Ticket3427 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: dont try to run the subtitle encoder on non subtitle streamsMichael Niedermayer2014-03-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'Michael Niedermayer2014-02-24
|\| | | | | | | | | | | | | | | | | | | | | * 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-20
|\| | | | | | | | | | | | | | | | | | | * 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-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix vstatsMichael Niedermayer2014-02-10
| | | | | | | | | | Broken by: 394fb56c29eee7f4f8f0334d8b5d30d3c54ac703 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: tweak debug_ts logging and add more of itStefano Sabatini2014-02-02
| | | | | | | | Help with debugging timestamp issues.
* | ffmpeg: print data size too in statisticMichael Niedermayer2014-01-31
| | | | | | | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: also count data streams bytesMichael Niedermayer2014-01-30
| | | | | | | | | | | | 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-26
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 20:23:04 +0000