[FFmpeg-cvslog] Merge commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e'
Michael Niedermayer
git at videolan.org
Tue Nov 19 17:58:52 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 19 16:52:23 2013 +0100| [2c6e693c975465691ced790ec52ef65588410117] | committer: Michael Niedermayer
Merge commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e'
* commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e':
mpeg4videodec: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c6e693c975465691ced790ec52ef65588410117
---
More information about the ffmpeg-cvslog
mailing list