diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-07-17 16:02:33 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-09-25 14:07:21 +0100 |
| commit | bb416bd68ca46b4a3f1901533064d56a6b8ac95e (patch) | |
| tree | 5bb1c25e11e5a4b2d62ca90f681526ca0da8ba40 | |
| parent | d1186ff72d75b6067770890758c4feb92abd84f7 (diff) | |
| download | ffmpeg-bb416bd68ca46b4a3f1901533064d56a6b8ac95e.tar.gz | |
lavf: do not set codec_tag for rawvideo
If the demuxer did not set a codec_tag, there is none and
inventing one makes no sense. This change stops the rawvideo
"decoder" over-writing user-supplied pixfmt with one derived
from the codec_tag. The pixfmt-codec_tag-pixfmt round-trip
is lossy since several pixfmts map to the same codec_tag.
This fixes fate-lavf-pixfmt with avfilter disabled.
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | libavformat/utils.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 17b342e8ad..b59cde0a2f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2418,9 +2418,6 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) (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); - // 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. // ipmovie.c produces. |