[FFmpeg-cvslog] Merge commit '3080b0497ddf8549d86ee99b79ac0c15f44ee382'
Michael Niedermayer
git at videolan.org
Sun May 3 00:59:50 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 2 23:43:51 2015 +0200| [db4649dd10940b00604e8f02d82f1f3dcd0f1e61] | committer: Michael Niedermayer
Merge commit '3080b0497ddf8549d86ee99b79ac0c15f44ee382'
* commit '3080b0497ddf8549d86ee99b79ac0c15f44ee382':
avprobe: Support writing arrays of integers without keys
Conflicts:
avprobe.c
Not merged
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db4649dd10940b00604e8f02d82f1f3dcd0f1e61
---
More information about the ffmpeg-cvslog
mailing list