]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 89c7332 e352520)
Merge commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Feb 2015 20:00:19 +0000 (21:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Feb 2015 20:01:52 +0000 (21:01 +0100)
* commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1':
  oma: Report a timestamp

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/omadec.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/omadec.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.