ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Feb 3 22:15:54 2015 +0100| [a83e0639c0ce779d6469208cb1cfbb934064be27] | committer: Michael Niedermayer
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 <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a83e0639c0ce779d6469208cb1cfbb934064be27 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog