aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-03 22:15:54 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-03 22:19:46 +0100
commita83e0639c0ce779d6469208cb1cfbb934064be27 (patch)
treee1bd7f81007997fb1038ace5a6e5bd2b3a03c0b3 /libavcodec
parentdeeba777ad0a0db018b1f93af32c5525a3a6a3a8 (diff)
parente3528d2a7bf29ba148d7ac1678552ce0089cd14f (diff)
downloadffmpeg-a83e0639c0ce779d6469208cb1cfbb934064be27.tar.gz
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>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions