diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-05 16:55:33 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-02-22 19:31:06 +0100 |
| commit | 0584e3ca9793b3ad1c6b50eca74c4cfa04244941 (patch) | |
| tree | 433eff4e94929e399317aaa1b7ff2a65dc7551bc /libavformat | |
| parent | e30b3e59a4f3004337cb1623b2aac988ce52b93f (diff) | |
| download | ffmpeg-0584e3ca9793b3ad1c6b50eca74c4cfa04244941.tar.gz | |
lavf: don't set AVCodecContext.has_b_frames in compute_pkt_fields().
It is not supposed to be done outside lavc.
This is basically a revert of 818062f2f346df30f4ec0c0c1f54e8025cc3a80a.
It is unclear what issue this was supposed to fix, if it reappears again
it will have to be fixed in a more proper place.
The wtv-demux test change is because the sample starts with a B-frame.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 24175228ab..d6aab568b8 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -854,10 +854,6 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, if((s->flags & AVFMT_FLAG_IGNDTS) && pkt->pts != AV_NOPTS_VALUE) pkt->dts= AV_NOPTS_VALUE; - if (st->codec->codec_id != CODEC_ID_H264 && pc && pc->pict_type == AV_PICTURE_TYPE_B) - //FIXME Set low_delay = 0 when has_b_frames = 1 - st->codec->has_b_frames = 1; - /* do we have a video B-frame ? */ delay= st->codec->has_b_frames; presentation_delayed = 0; |