diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:18:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:18:57 +0200 |
| commit | 9265bae3567c85b55fc4cdfad141bb34a939d6fd (patch) | |
| tree | 402371fa75c079a49acb111b1a560a2cfe15c945 /libavformat/mxf.c | |
| parent | 9f91e7deecc16172cad1f2904704ed48ffb0e1b0 (diff) | |
| parent | f776899a17dce32ad7fb9231d98f15558f37cc3f (diff) | |
| download | ffmpeg-9265bae3567c85b55fc4cdfad141bb34a939d6fd.tar.gz | |
Merge commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f'
* commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f':
bitstream: K&R formatting cosmetics
Conflicts:
libavcodec/bitstream.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxf.c')
0 files changed, 0 insertions, 0 deletions