]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: deeba77 e3528d2)
Merge commit 'e3528d2a7bf29ba148d7ac1678552ce0089cd14f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Feb 2015 21:15:54 +0000 (22:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Feb 2015 21:19:46 +0000 (22:19 +0100)
commita83e0639c0ce779d6469208cb1cfbb934064be27
treee1bd7f81007997fb1038ace5a6e5bd2b3a03c0b3tree | snapshot
parentdeeba777ad0a0db018b1f93af32c5525a3a6a3a8commit | diff
parente3528d2a7bf29ba148d7ac1678552ce0089cd14fcommit | diff
Merge commit 'e3528d2a7bf29ba148d7ac1678552ce0089cd14f'

* commit 'e3528d2a7bf29ba148d7ac1678552ce0089cd14f':
  mov: Implement parsing of the "HandlerName" from the MP4 HDLR atom

Conflicts:
libavformat/mov.c

See: b76bc010343b0cff8717cc7ee81e47273272336c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mov.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.