Michael Niedermayer
576654302b
ffmpeg: use av_log_ask_for_sample() instead of duplicating avpriv_request_sample()
2014-06-03 16:05:37 +02:00
Michael Niedermayer
2422a7ffe4
Loose mplayer in MPlayer/incoming/
...
Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 16:03:44 +02:00
Michael Niedermayer
3e7b4b9fbd
Add direct link to ML in missing_feature_sample()
...
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 15:58:27 +02:00
Michael Niedermayer
768ef0f19e
ffmpeg: request sample if the decoder & demuxer has_b_frames mismatch
...
We cannot use avpriv_request_sample() as this is private to the libs
or rather it would be a bad usage example
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 15:24:00 +02:00
Michael Niedermayer
a0b2de77ed
ffmpeg: remove "has_b_frames" backpassing
...
It seems working without this now for the files i tested it with, if this causes
a regression, dont hesitate to put the line back or open a ticket or fix (if possible)
the parser
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 15:23:43 +02:00
Michael Niedermayer
00dcb10631
ffmpeg: Fix encoder names in printout
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 17:15:56 +02:00
Michael Niedermayer
0949bbc431
ffmpeg: fix for-muxer AVCodecContext stuff
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 17:15:55 +02:00
Michael Niedermayer
862120f980
Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d'
...
* commit '383136264ef40452efd86cafb2d7221cd3830b3d':
avconv: do not use the stream codec context for encoding
Conflicts:
ffmpeg.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 15:53:23 +02:00
Michael Niedermayer
a87685d8e8
ffmpeg: add note about why has_b_frame is copied and when it can be removed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 15:32:50 +02:00
Michael Niedermayer
921d5ae3bc
ffmpeg: replace remaining, ffmpeg specific ist->st->codec by ist->dec_ctx
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 15:30:51 +02:00
Michael Niedermayer
9fb45334fc
ffmpeg: copy b frame codec delay back from decoder to demuxer
...
The demuxer needs this value to generate correct timestamps in some corner cases
Ideally the parser would always set this correctly, but some parsers lac support
for extracting this value, also its not trivial.
This fixes a regression
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 15:30:15 +02:00
Michael Niedermayer
d097935767
Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'
...
* commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5':
avconv: do not use the stream codec context for decoding
Conflicts:
ffmpeg.c
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 14:35:53 +02:00
Michael Niedermayer
b3f4615081
ffmpeg: fix check for muxing overhead being unknown
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29 23:39:54 +02:00
Nicolas George
fc9c857c2d
ffmpeg: use thread message API.
2014-05-26 11:40:21 +02:00
Michael Niedermayer
1f359c8559
ffmpeg: use av_stream_get_end_pts()
...
Simplifies code and should correct timing values when -*sync drop is used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-21 18:53:42 +02:00
Michael Niedermayer
b2a8bc3d04
ffmpeg/set_encoder_id: dont allocate encoder string if one is already set
...
Fixes memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 00:51:47 +02:00
Lukasz Marek
4d686674b2
ffmpeg: use av_fifo_alloc_array
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-20 00:00:44 +02:00
Michael Niedermayer
833ec9177d
ffmpeg/do_video_stats: fix used timebase
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19 20:54:27 +02:00
Michael Niedermayer
dad54e4a62
ffmpeg: set dts for subtitles
...
dts is not optional, its required for muxing,
previously it was set from AVStream.pts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19 16:07:50 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Olivier Langlois
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Lukasz Marek
a5f2f33a67
ffmpeg: use av_fifo_freep
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-07 23:39:47 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
feaa31d354
ffmpeg: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 02:23:08 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
506064ed10
ffmpeg: frame droping due to fps should not be a warning
...
This reverts part of 41e7e46cac
See: http://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
Michael Niedermayer
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
Michael Niedermayer
cb640eb335
ffmpeg: move packet deallocation into write_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 19:50:39 +01:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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