[FFmpeg-cvslog] Merge commit 'b78f81c8033904e2e75add0c9a603df6df514a30'

Michael Niedermayer git at videolan.org
Fri Apr 5 21:58:43 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr  5 21:53:57 2013 +0200| [04b0fd7e91b9a4f5e58744a61d8993bb7898b13b] | committer: Michael Niedermayer

Merge commit 'b78f81c8033904e2e75add0c9a603df6df514a30'

* commit 'b78f81c8033904e2e75add0c9a603df6df514a30':
  h261: K&R formatting and prettyprinting cosmetics

Conflicts:
	libavcodec/h261_parser.c
	libavcodec/h261data.h
	libavcodec/h261dec.c
	libavcodec/h261enc.c

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

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





More information about the ffmpeg-cvslog mailing list