[FFmpeg-cvslog] Merge commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91'
Michael Niedermayer
git at videolan.org
Fri Jun 12 23:03:05 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 12 22:55:49 2015 +0200| [00ebf89dcdeb0587eba80ebd634591873f64624a] | committer: Michael Niedermayer
Merge commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91'
* commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91':
flv: Name an enum and use its type
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=00ebf89dcdeb0587eba80ebd634591873f64624a
---
More information about the ffmpeg-cvslog
mailing list