Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/ffmpeg.c
AgeCommit message (Collapse)Author
2014-06-15ffmpeg: for h264 we need has_b_frames from the decoderMichael Niedermayer
Other solutions welcome Fixes Ticket3711 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-15ffmpeg: print values of mismatching has_b_framesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-14ffmpeg: Fix bitstream filters manipulating AVCodecContextMichael Niedermayer
Fixes Ticket3715 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-12Merge commit '48e50921337984ba4ec2c1cafe45d43787f84498'Michael Niedermayer
* commit '48e50921337984ba4ec2c1cafe45d43787f84498': avconv: make -shortest work with streamcopy Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-05ffmpeg: prevent pts < dts to be passed through to the muxer on stream copyMichael Niedermayer
Fixes Ticket3658 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-04Merge commit '39ec5e1cf8444f827c42effb76e5694e091bbff3'Michael Niedermayer
* commit '39ec5e1cf8444f827c42effb76e5694e091bbff3': avconv: Report the codec and the encoder separately Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03fix various typosLou Logan
Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03ffmpeg: try to use the more fitting of the 2 encoder contextsMichael Niedermayer
This fixes the interactively enabled encoder debug by pressing 'D' Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03ffmpeg: use av_log_ask_for_sample() instead of duplicating ↵Michael Niedermayer
avpriv_request_sample()
2014-06-03Loose mplayer in MPlayer/incoming/Michael Niedermayer
Found-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03Add direct link to ML in missing_feature_sample()Michael Niedermayer
Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03ffmpeg: request sample if the decoder & demuxer has_b_frames mismatchMichael Niedermayer
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-03ffmpeg: remove "has_b_frames" backpassingMichael Niedermayer
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-01ffmpeg: Fix encoder names in printoutMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01ffmpeg: fix for-muxer AVCodecContext stuffMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d'Michael Niedermayer
* 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-01ffmpeg: add note about why has_b_frame is copied and when it can be removedMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01ffmpeg: replace remaining, ffmpeg specific ist->st->codec by ist->dec_ctxMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01ffmpeg: copy b frame codec delay back from decoder to demuxerMichael Niedermayer
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-01Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'Michael Niedermayer
* 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-05-30ffmpeg: fix check for muxing overhead being unknownMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-26ffmpeg: use thread message API.Nicolas George
2014-05-21ffmpeg: use av_stream_get_end_pts()Michael Niedermayer
Simplifies code and should correct timing values when -*sync drop is used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20ffmpeg/set_encoder_id: dont allocate encoder string if one is already setMichael Niedermayer
Fixes memleak Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20ffmpeg: use av_fifo_alloc_arrayLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-19ffmpeg/do_video_stats: fix used timebaseMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19ffmpeg: set dts for subtitlesMichael Niedermayer
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-19ffmpeg: add last_mux_dts_plus_durationMichael Niedermayer
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-19Merge commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0'Michael Niedermayer
* commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0': avconv: do not use poorly defined and undocumented AVStream.pts Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19ffmpeg: Use av_gettime_relative()Olivier Langlois
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-19ffmpeg: prefix encoder with "Lavc " in bitexact modeMichael Niedermayer
This avoids misleading encoder names like "encoder = prores" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19ffmpeg: Skip writing the version when -flags bitexact is usedMichael Niedermayer
Alternatively every fate test could be changed to pass both fflags and flags +bitexact Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-18Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'Michael Niedermayer
* 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-18Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'Michael Niedermayer
* commit '93afb6c98df876b15e3d911a9450ad55f92080ce': avconv: set output avg_frame_rate when known Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-16ffmpeg: bitstream filters require split out side dataMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-08ffmpeg: use av_fifo_freepLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-05Merge commit '9580818c5d934bde65a95efd2cee61c174721092'Michael Niedermayer
* commit '9580818c5d934bde65a95efd2cee61c174721092': avconv: rename OutputStream.opts to OutputStream.encoder_opts Conflicts: ffmpeg.c ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'Michael Niedermayer
* commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11': avconv: remove a useless line Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d'Michael Niedermayer
* commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d': avconv: rename 'codec' to 'enc_ctx' Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05Merge commit '650a5206a944fd36a42d92f98e745972056b1f7c'Michael Niedermayer
* commit '650a5206a944fd36a42d92f98e745972056b1f7c': avconv: rename 'icodec' to 'dec_ctx' Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'Michael Niedermayer
* commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66': avconv: rename InputStream.opts to InputStream.decoder_opts Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05Merge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3'Michael Niedermayer
* commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3': avconv: simplify exit_program() by using more local vars Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-02ffmpeg: put the sizeof() second in av_malloc_array()Michael Niedermayer
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-01ffmpeg: use av_malloc_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30ffmpeg: dont print "Conversion failed" if conversion has never startedMichael Niedermayer
Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29ffmpeg: print an error at the end if conversion failedMichael Niedermayer
Fixes Ticket3477 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-22Merge commit '1ae8198bca749a0cff205196cc83d35b9962849b'Michael Niedermayer
* commit '1ae8198bca749a0cff205196cc83d35b9962849b': avconv: always reset packet pts after decoding an audio frame Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-18ffmpeg: fix mixed merged & split side data with the stream->packet hackMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11ffmpeg: stop protocols on interrupt when no transcoding has happened yetMichael Niedermayer
Fixes Ticket3344 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04ffmpeg: frame droping due to fps should not be a warningMichael Niedermayer
This reverts part of 41e7e46cac507e993af6d656c8d3672ba3f9e304 See: http://thread.gmane.org/gmane.comp.video.ffmpeg.user/51229 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 04:14:40 +0300