87f5ede6b5
ffmpeg: add last_mux_dts_plus_duration
...
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 >
2014-05-19 15:35:20 +02:00
2de2b991ca
Merge commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0'
...
* commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0':
avconv: do not use poorly defined and undocumented AVStream.pts
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-19 15:13:16 +02:00
76191c08f8
ffmpeg: Use av_gettime_relative()
...
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 >
2014-05-19 02:35:07 +02:00
0c152fe916
ffmpeg: prefix encoder with "Lavc " in bitexact mode
...
This avoids misleading encoder names like "encoder = prores"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-18 22:57:20 +02:00
bbee02ed9c
ffmpeg: Skip writing the version when -flags bitexact is used
...
Alternatively every fate test could be changed to pass both fflags and flags +bitexact
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-18 22:00:00 +02:00
1e49439f04
Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'
...
* 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 >
2014-05-18 21:31:51 +02:00
8334850a99
Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'
...
* commit '93afb6c98df876b15e3d911a9450ad55f92080ce':
avconv: set output avg_frame_rate when known
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-18 14:38:36 +02:00
e9602dcb4d
ffmpeg: bitstream filters require split out side data
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-15 22:41:12 +02:00
a5f2f33a67
ffmpeg: use av_fifo_freep
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com >
2014-05-07 23:39:47 +02:00
d5ec1ddf7b
Merge commit '9580818c5d934bde65a95efd2cee61c174721092'
...
* commit '9580818c5d934bde65a95efd2cee61c174721092':
avconv: rename OutputStream.opts to OutputStream.encoder_opts
Conflicts:
ffmpeg.c
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-05 15:51:55 +02:00
22ffa5390f
Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'
...
* commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11':
avconv: remove a useless line
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-05 15:09:55 +02:00
1efc089218
Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d'
...
* commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d':
avconv: rename 'codec' to 'enc_ctx'
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-05 15:03:52 +02:00
1f40536cca
Merge commit '650a5206a944fd36a42d92f98e745972056b1f7c'
...
* commit '650a5206a944fd36a42d92f98e745972056b1f7c':
avconv: rename 'icodec' to 'dec_ctx'
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-05 14:55:26 +02:00
42b7bda41a
Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'
...
* commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66':
avconv: rename InputStream.opts to InputStream.decoder_opts
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-05 14:44:33 +02:00
6e39707438
Merge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3'
...
* commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3':
avconv: simplify exit_program() by using more local vars
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-05 14:39:13 +02:00
a3477fef2b
ffmpeg: put the sizeof() second in av_malloc_array()
...
This is purely a cosmetic change
Suggested-by: Clément Bœsch <u@pkh.me >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-01 22:01:38 +02:00
feaa31d354
ffmpeg: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-01 02:23:08 +02:00
ed72dae4cf
ffmpeg: dont print "Conversion failed" if conversion has never started
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-29 23:45:22 +02:00
fed0acebad
ffmpeg: print an error at the end if conversion failed
...
Fixes Ticket3477
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-29 00:09:08 +02:00
3bf189bb00
Merge commit '1ae8198bca749a0cff205196cc83d35b9962849b'
...
* commit '1ae8198bca749a0cff205196cc83d35b9962849b':
avconv: always reset packet pts after decoding an audio frame
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-22 13:45:34 +02:00
e48fb4e1a5
ffmpeg: fix mixed merged & split side data with the stream->packet hack
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-18 01:01:38 +02:00
517cc81e93
ffmpeg: stop protocols on interrupt when no transcoding has happened yet
...
Fixes Ticket3344
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-10 22:29:23 +02:00
506064ed10
ffmpeg: frame droping due to fps should not be a warning
...
This reverts part of 41e7e46cachttp://thread.gmane.org/gmane.comp.video.ffmpeg.user/51229
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-04 21:15:31 +02:00
41e7e46cac
Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'
...
* commit 'aa499568afc01d59215eef7e5b14b949a9671afc':
avconv: More descriptive message about framedrop
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-25 19:25:10 +01:00
cb640eb335
ffmpeg: move packet deallocation into write_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-24 19:50:39 +01:00
33a7e288ab
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avconv: don't warn on multiple frames per packet for codecs that expect it
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-24 16:46:06 +01:00
1046cd60d4
Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'
...
* commit '4754345027eb85cfa51aeb88beec68d7b036c11e':
avconv: print verbose per-stream transcoding statistics
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-24 16:40:35 +01:00
afa442c198
Merge commit 'a220b07b0f971f88213aef012aea51af2800be62'
...
* commit 'a220b07b0f971f88213aef012aea51af2800be62':
avconv: split printing the final statistics into a separate function
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-24 16:30:29 +01:00
13278b97ae
Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2'
...
* commit 'baeb59d89beda499688e528c6a269d2b255b66f2':
avconv: rewrite output data size tracking
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-24 16:11:13 +01:00
8a9878b4ff
Merge commit 'f759f66e367bc62ed7738a51040f775b656a60d8'
...
* commit 'f759f66e367bc62ed7738a51040f775b656a60d8':
avconv: explicitly report when the muxing overhead is unknown
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-24 15:52:50 +01:00
82e6660ae2
Merge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9'
...
* commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9':
avconv: add stream-global side data to the first demuxed packet
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-24 14:44:22 +01:00
521707d42e
ffmpeg: sub2video: send a last blank frame before closing.
...
Fix trac ticket #3420 .
2014-03-23 19:16:35 +01:00
9dca02ee54
ffmpeg: dont call exit_program() from a signal hander
...
This is unsafe and can deadlock amongth other things
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-21 17:09:56 +01:00
d3ed8a4d2b
ffmpeg: try to avoid calling av_log() from sigterm_handler()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-20 16:24:17 +01:00
4d17179b37
ffmpeg: fix printing INT64_MIN pts at the end
...
Fixes Ticket3427
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-16 06:26:40 +01:00
b79dfd16cb
ffmpeg: dont try to run the subtitle encoder on non subtitle streams
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-03 21:06:24 +01:00
70a25587d2
Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'
...
* commit '67f2a688143b644f99360565a9f36c61a5f052e9':
avconv: remove a write-only variable
Conflicts:
ffmpeg.c
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-24 21:08:19 +01:00
f2387152bc
Merge commit '5c79d2e12d13959fc6aed92d102c25194a06de05'
...
* commit '5c79d2e12d13959fc6aed92d102c25194a06de05':
avconv: Do not divide by zero
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-20 23:59:09 +01:00
299a56879d
ffmpeg: make reading packets from thread blocking.
...
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 .
2014-02-20 11:22:55 +01:00
3734c3ea51
ffmpeg: reduce frame rate for mpeg4 to be within the spec limits
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-19 18:40:27 +01:00
3868e97c6b
ffmpeg: fix vstats
...
Broken by: 394fb56c29michaelni@gmx.at >
2014-02-10 20:31:06 +01:00
290da7e754
ffmpeg: tweak debug_ts logging and add more of it
...
Help with debugging timestamp issues.
2014-02-02 13:11:52 +01:00
2e02d71237
ffmpeg: print data size too in statistic
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-31 01:36:47 +01:00
be7b76230f
ffmpeg: also count data streams bytes
...
Fixes wrong error message about empty output file
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-30 20:17:10 +01:00
9651239f67
ffmpeg: use intermediary variables in reap_filters, increase readability
2014-01-26 18:06:39 +01:00
094516a5d0
ffmpeg: use av_err2str() macro
...
Simplify.
2014-01-23 16:29:44 +01:00
9f956d9d8d
ffmpeg: apply misc cosmetics to process_input() code
2014-01-23 16:29:39 +01:00
740e6042a0
ffmpeg: change ost->finished to an enum
...
Idea-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-17 23:57:02 +01:00
d73f897669
ffmpeg: update statistics only when a packet is actually muxed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-17 23:47:39 +01:00
5c459504f6
ffmpeg/flush_encoders: dont mux packets once ost->finished has been set
...
Fixes muxing frames after av_interleaved_write_frame() failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-17 23:47:38 +01:00
