diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 13:55:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 14:12:37 +0100 |
| commit | 17e47ec8be200d54aa7ef31994e1ba5ea5f32622 (patch) | |
| tree | 76487e09972cc3e450aebfcaa6259262e88e3e45 /libavcodec/h261dec.c | |
| parent | feba750dcd49e8410a4abaf3fbcc0554452206bc (diff) | |
| parent | a1c5cc429d99216406170eac7e8352860076d3e8 (diff) | |
| download | ffmpeg-17e47ec8be200d54aa7ef31994e1ba5ea5f32622.tar.gz | |
Merge commit 'a1c5cc429d99216406170eac7e8352860076d3e8'
* commit 'a1c5cc429d99216406170eac7e8352860076d3e8':
lavc: don't set AVFrame.pts to random numbers in decoders.
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h261dec.c')
| -rw-r--r-- | libavcodec/h261dec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 50bfec94dd..5e45fc7b9e 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -478,7 +478,6 @@ static int h261_decode_picture_header(H261Context *h) s->picture_number = (s->picture_number & ~31) + i; s->avctx->time_base = (AVRational) { 1001, 30000 }; - s->current_picture.f.pts = s->picture_number; /* PTYPE starts here */ skip_bits1(&s->gb); /* split screen off */ |