Merge commit '75439bb31b3ab76f9a4d30c5de4ff9f407ec8128'
* commit '75439bb31b3ab76f9a4d30c5de4ff9f407ec8128': siff: K&R formatting cosmetics Conflicts: libavformat/siff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
46a16ca15a
@ -21,6 +21,7 @@
|
||||
|
||||
#include "libavutil/channel_layout.h"
|
||||
#include "libavutil/intreadwrite.h"
|
||||
|
||||
#include "avformat.h"
|
||||
#include "internal.h"
|
||||
#include "avio_internal.h"
|
||||
|
Loading…
x
Reference in New Issue
Block a user