diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2005-05-08 20:15:42 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2005-05-08 20:15:42 +0000 |
commit | 9cd81798187567c1495c595443923951c0c06926 (patch) | |
tree | ab1bed1b8a627f75e4aa82e41039293a2c4f51a2 /libavcodec/mpeg12.c | |
parent | c998bdd9a03d3efa42bfba447579330d51d033fa (diff) | |
download | ffmpeg-9cd81798187567c1495c595443923951c0c06926.tar.gz |
#defines for strict_std_compliance and split between inofficial extensions and non standarized things
Originally committed as revision 4205 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
-rw-r--r-- | libavcodec/mpeg12.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 47c7887424..ba77a915c9 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -203,7 +203,7 @@ static int find_frame_rate_index(MpegEncContext *s){ for(i=1;i<14;i++) { int64_t n0= 1001LL/frame_rate_tab[i].den*frame_rate_tab[i].num*s->avctx->time_base.num; int64_t n1= 1001LL*s->avctx->time_base.den; - if(s->avctx->strict_std_compliance >= 0 && i>=9) break; + if(s->avctx->strict_std_compliance > FF_COMPLIANCE_INOFFICIAL && i>=9) break; d = ABS(n0 - n1); if(d < dmin){ @@ -225,7 +225,7 @@ static int encode_init(AVCodecContext *avctx) return -1; if(find_frame_rate_index(s) < 0){ - if(s->strict_std_compliance >=0){ + if(s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL){ av_log(avctx, AV_LOG_ERROR, "MPEG1/2 does not support %d/%d fps\n", avctx->time_base.den, avctx->time_base.num); return -1; }else{ |