diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 14:13:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 14:19:13 +0200 |
| commit | ef7e8efc6befaf02b0953dbbbeb2fc0648b7bb58 (patch) | |
| tree | 8745e0f77494b16ad306c0cb273adbd755748e15 /libavdevice/avdevice.h | |
| parent | 7bac6e5cf81b1f956f06d15546a376e32f4ea558 (diff) | |
| parent | ce67f442be0f6c4a8794272873852e256b5b8ee4 (diff) | |
| download | ffmpeg-ef7e8efc6befaf02b0953dbbbeb2fc0648b7bb58.tar.gz | |
Merge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4'
* commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4':
lavf: Avoid setting avg_frame_rate if delta_dts is negative
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/avdevice.h')
0 files changed, 0 insertions, 0 deletions