On 06/13/2011 05:23 AM, Anton Khirnov wrote: > From: Michael Niedermayer <[email protected]> > > Signed-off-by: Michael Niedermayer <[email protected]> > Signed-off-by: Anton Khirnov <[email protected]> > --- > libavformat/utils.c | 8 ++++++-- > 1 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/libavformat/utils.c b/libavformat/utils.c > index d0fd0d4..d7664cb 100644 > --- a/libavformat/utils.c > +++ b/libavformat/utils.c > @@ -25,6 +25,7 @@ > #include "avio_internal.h" > #include "internal.h" > #include "libavcodec/internal.h" > +#include "libavcodec/raw.h" > #include "libavutil/opt.h" > #include "libavutil/dict.h" > #include "metadata.h" > @@ -2345,8 +2346,11 @@ int av_find_stream_info(AVFormatContext *ic) > (st->codec_info_nb_frames-2)*(int64_t)st->time_base.den, > > st->info->codec_info_duration*(int64_t)st->time_base.num, 60000); > if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { > - if(st->codec->codec_id == CODEC_ID_RAWVIDEO && > !st->codec->codec_tag && !st->codec->bits_per_coded_sample) > - st->codec->codec_tag= > avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt); > + if(st->codec->codec_id == CODEC_ID_RAWVIDEO && > !st->codec->codec_tag && !st->codec->bits_per_coded_sample){ > + uint32_t tag= > avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt); > + if(ff_find_pix_fmt(ff_raw_pix_fmt_tags, tag) == > st->codec->pix_fmt) > + st->codec->codec_tag= tag; > + } > > // the check for tb_unreliable() is not completely correct, > since this is not about handling > // a unreliable/inexact time base, but a time base that is finer > than necessary, as e.g.
This makes all of libavformat depend on rawdec.o, which is not compiled unconditionally. Is there maybe a follow-up commit that adds the dependency or moves the function to utils.c? -Justin _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
