[FFmpeg-devel] [PATCH] ffmpeg: switch to codecpar

Clément Bœsch u at pkh.me
Wed Sep 21 16:43:37 EEST 2016


On Wed, Sep 21, 2016 at 02:20:03PM +0200, Michael Niedermayer wrote:
> On Wed, Sep 21, 2016 at 12:45:40PM +0200, Clément Bœsch wrote:
> > On Wed, Sep 21, 2016 at 12:26:48PM +0200, Michael Niedermayer wrote:
> > > On Tue, Sep 20, 2016 at 11:20:48PM +0200, Clément Bœsch wrote:
> > > > From: Clément Bœsch <clement at stupeflix.com>
> > > > 
> > > > This commit is largely based on commit 15e84ed3 from Anton Khirnov
> > > > <anton at khirnov.net> which was previously skipped in bbf5ef9d.
> > > > 
> > > > There are still a bunch of things raising codecpar related warnings that
> > > > need fixing, such as:
> > > > - the use of codec->debug in the interactive debug mode
> > > > - read_ffserver_streams(): it's probably broken now but there is no test
> > > > - lowres stuff
> > > > - codec copy apparently required by bitstream filters
> > > > 
> > > > The matroska references are updated because they now properly forward
> > > > the field_order (previously unknown, now progressive).
> > > > 
> > > > Thanks to James Almer for fixing a bunch of FATE issues in this commit.
> > > > 
> > > > Signed-off-by: Clément Bœsch <clement at stupeflix.com>
> > > > Signed-off-by: James Almer <jamrial at gmail.com>
> > > > ---
> > > > Changes since previous patch:
> > > > - restore the usage of avctx instead of ost->enc_ctx in the extradata stuff
> > > >   (which is going away in later commits)
> > > > - unconditionnally set pkt_timebase (as suggested by nevcairiel) with a new
> > > >   simpler comment
> > > > - restored the frame_size copy which i discarded by mistake
> > > > ---
> > > >  cmdutils.c               |   4 +-
> > > >  ffmpeg.c                 | 234 +++++++++++++++++++++++++----------------------
> > > >  ffmpeg.h                 |   1 +
> > > >  ffmpeg_filter.c          |  24 ++---
> > > >  ffmpeg_opt.c             | 140 ++++++++++++++++------------
> > > 
> > > >  libavformat/utils.c      |   2 +-
> > > 
> > > This should go in a seperate patch possibly with a version bump
> > > so ffmpeg.c can properly "depend" on that avformat version
> > > 
> > 
> > would it be OK to replace that condition with
> > (ost->codecpar->codec_tag == AV_RL32("tmcd") || enc_ctx->codec_tag == AV_RL32("tmcd"))
> > within that commit?
> 
> ok
> 

Applied, thanks

-- 
Clément B.


More information about the ffmpeg-devel mailing list