diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:35:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:35:05 +0200 |
| commit | c55bebe2cc7bd444f83a678babc1b287aa7a3da1 (patch) | |
| tree | 3970c69732f54db67ee63ce33c2e456e19ce079c /ffplay.c | |
| parent | 85fe70b64c3d0c46ba5a8c7b501283e3b97e24e4 (diff) | |
| parent | 90558e848a29ef1e85ecb1832ad9a26eebe958e0 (diff) | |
| download | ffmpeg-c55bebe2cc7bd444f83a678babc1b287aa7a3da1.tar.gz | |
Merge commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0'
* commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0':
rangecoder: K&R formatting cosmetics
Conflicts:
libavcodec/rangecoder.c
libavcodec/rangecoder.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions