diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-05 21:53:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-05 21:53:57 +0200 |
| commit | 04b0fd7e91b9a4f5e58744a61d8993bb7898b13b (patch) | |
| tree | 7bdca30124ee8815a3d18c2a9e5e176d714490b4 /Changelog | |
| parent | e7c801d9d319e3dcc354694499269796df0acdee (diff) | |
| parent | b78f81c8033904e2e75add0c9a603df6df514a30 (diff) | |
| download | ffmpeg-04b0fd7e91b9a4f5e58744a61d8993bb7898b13b.tar.gz | |
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>
Diffstat (limited to 'Changelog')
0 files changed, 0 insertions, 0 deletions