Merge commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72'

Browse Source

* commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72':
  avplay: Use av_gettime_relative

Conflicts:
	ffplay.c

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

...

This commit is contained in:

Michael Niedermayer 2014-10-24 12:16:09 +02:00

parent 63001833c5 248d8fb60c

commit 872e087305

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available