summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-02-24 13:35:54 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-02-24 13:35:54 +0000
commit7f123e7f8ad2cfd4ab7e2fbd83e17d0a8b436785 (patch)
tree9d33fba33840fa1d5f5586fa1833270dca30d5df /libavformat
parentd4f2a6250aa0598a4a6414a3eb34e4f462b290b0 (diff)
Add CODEC_ID_H264 to tb_unreliable(), it belongs there for the same
reason as mpeg2. (telecine amongth others) Originally committed as revision 17551 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/utils.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index f5bcf89081..46a1b5f8bb 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1976,7 +1976,9 @@ static int tb_unreliable(AVCodecContext *c){
|| c->time_base.den < 5L*c->time_base.num
/* || c->codec_tag == AV_RL32("DIVX")
|| c->codec_tag == AV_RL32("XVID")*/
- || c->codec_id == CODEC_ID_MPEG2VIDEO)
+ || c->codec_id == CODEC_ID_MPEG2VIDEO
+ || c->codec_id == CODEC_ID_H264
+ )
return 1;
return 0;
}