Merge commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Oct 2014 10:16:09 +0000 (12:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Oct 2014 10:19:35 +0000 (12:19 +0200)
commit872e087305a46377b77eaedc4e90d4ab451ae7be
tree74ccc8e37900294406d386e9270f11e9214d6ffb
parent63001833c51c3911347ee81520066ac9690b2204
parent248d8fb60c59c8e044d9c8f78f23383b7cdecf72
Merge commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72'

* commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72':
  avplay: Use av_gettime_relative

Conflicts:
ffplay.c

See: 0ca0b4c29cf750cbb15732cddbe16723a66afda8
Merged-by: Michael Niedermayer <michaelni@gmx.at>