diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-02 22:07:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-02 22:07:06 +0200 |
| commit | c8be5258dec928119fab414341b13c0cf5405294 (patch) | |
| tree | 01c101275f27b02abbda414b4b8d5b0b3dca72bd /libavcodec/flv.h | |
| parent | 4c731233338d2bc6d9646808b7599224450932c6 (diff) | |
| parent | ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef (diff) | |
Merge commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef'
* commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef':
flv: K&R formatting cosmetics
Conflicts:
libavcodec/flv.h
libavcodec/flvdec.c
libavcodec/flvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flv.h')
| -rw-r--r-- | libavcodec/flv.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/flv.h b/libavcodec/flv.h index df508203b3..561cfe0baa 100644 --- a/libavcodec/flv.h +++ b/libavcodec/flv.h @@ -1,5 +1,6 @@ /* * FLV specific private header. + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -20,12 +21,13 @@ #ifndef AVCODEC_FLV_H #define AVCODEC_FLV_H -#include "mpegvideo.h" #include "get_bits.h" +#include "mpegvideo.h" #include "put_bits.h" -void ff_flv_encode_picture_header(MpegEncContext * s, int picture_number); -void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, int run, int last); +void ff_flv_encode_picture_header(MpegEncContext *s, int picture_number); +void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, int run, + int last); int ff_flv_decode_picture_header(MpegEncContext *s); |