Merge commit '75439bb31b
'
* commit '75439bb31b
':
siff: K&R formatting cosmetics
Conflicts:
libavformat/siff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
46a16ca15a
1 changed files with 42 additions and 41 deletions
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
#include "libavutil/channel_layout.h"
|
#include "libavutil/channel_layout.h"
|
||||||
#include "libavutil/intreadwrite.h"
|
#include "libavutil/intreadwrite.h"
|
||||||
|
|
||||||
#include "avformat.h"
|
#include "avformat.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
#include "avio_internal.h"
|
#include "avio_internal.h"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue