diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 18:31:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 18:31:41 +0100 |
| commit | 1654e64bba809d3fde8b4cb8a1615796a218c36f (patch) | |
| tree | 6a9e2d4ffb792be5720f1248bc01537c6a9d4354 /libavcodec/tiff_data.h | |
| parent | a805e2e6530104e9e6211f51fdab55d905da3eda (diff) | |
| parent | c68d4c230ad8ca85af3999a6af8e582c43620d58 (diff) | |
| download | ffmpeg-1654e64bba809d3fde8b4cb8a1615796a218c36f.tar.gz | |
Merge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58'
* commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58':
mpeg4video_parser: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg4video_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tiff_data.h')
0 files changed, 0 insertions, 0 deletions