diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-25 13:51:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-25 13:51:43 +0200 |
| commit | 59f49667569b5d92a7713b6db75a9e6bfa939079 (patch) | |
| tree | fcb899c432d721855f33febba1f00fd32298268a /tests/ref/fate/h264-conformance-camanl2_toshiba_b | |
| parent | 8f3d3e5f8373d64f4b05dd1908c048dc0e49e21f (diff) | |
| parent | 86a361081d3eb4e999d75bc2a462f01d88cbd2e5 (diff) | |
| download | ffmpeg-59f49667569b5d92a7713b6db75a9e6bfa939079.tar.gz | |
Merge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5'
* commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5':
lmlm4: K&R formatting cosmetics
Conflicts:
libavformat/lmlm4.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/h264-conformance-camanl2_toshiba_b')
0 files changed, 0 insertions, 0 deletions