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 /libavfilter | |
| 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 'libavfilter')
0 files changed, 0 insertions, 0 deletions