]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99c2680 a74f812)
Merge commit 'a74f8121d88e0bdf0d69c22e4b3713032da9300a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Oct 2014 20:23:01 +0000 (22:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Oct 2014 20:24:12 +0000 (22:24 +0200)
* commit 'a74f8121d88e0bdf0d69c22e4b3713032da9300a':
  mov: Handle tfdt atoms

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

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