Michael Niedermayer 04b0fd7e91 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@gmx.at>

2013-04-05 21:53:57 +02:00

2.8 KiB

Raw Blame History

View Raw