[FFmpeg-cvslog] Merge commit 'a1c699659d56b76c0bf399307f642c6fd6d28281'

Michael Niedermayer git at videolan.org
Tue Feb 25 19:18:35 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 25 19:12:30 2014 +0100| [72d580f819eda3656341072f61a743005ab97729] | committer: Michael Niedermayer

Merge commit 'a1c699659d56b76c0bf399307f642c6fd6d28281'

* commit 'a1c699659d56b76c0bf399307f642c6fd6d28281':
  parser: K&R formatting cosmetics

Conflicts:
	libavcodec/parser.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72d580f819eda3656341072f61a743005ab97729
---





More information about the ffmpeg-cvslog mailing list