]> git.sesse.net Git - ffmpeg/commit
Merge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Sep 2013 12:13:43 +0000 (14:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Sep 2013 12:19:13 +0000 (14:19 +0200)
commitef7e8efc6befaf02b0953dbbbeb2fc0648b7bb58
tree8745e0f77494b16ad306c0cb273adbd755748e15
parent7bac6e5cf81b1f956f06d15546a376e32f4ea558
parentce67f442be0f6c4a8794272873852e256b5b8ee4
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>
libavformat/utils.c