diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-02 12:07:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-02 12:08:56 +0200 |
| commit | ae48547a5296f7aa5518d934325aeaddbdad2cd5 (patch) | |
| tree | 3a61180d468bb4e632f302beb47c5e95f6bafa8b /libavformat/img2.c | |
| parent | cb73f84087abe2d5fecaacc199246bacf2f450c8 (diff) | |
| parent | e4529df944616917ae8462f5102253ff7f983093 (diff) | |
| download | ffmpeg-ae48547a5296f7aa5518d934325aeaddbdad2cd5.tar.gz | |
Merge commit 'e4529df944616917ae8462f5102253ff7f983093'
* commit 'e4529df944616917ae8462f5102253ff7f983093':
flvdec: K&R formatting cosmetics
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2.c')
0 files changed, 0 insertions, 0 deletions