ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Aug 8
21:31:54 2014 +0200| [a698efbc9df3c6e503f395f040f5170de3f5cb85] | committer:
Michael Niedermayer
Merge commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472'
* commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472':
mpeg: K&R formatting cosmetics
Conflicts:
libavformat/mpegenc.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a698efbc9df3c6e503f395f040f5170de3f5cb85
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
