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/flvdec.c | |
| 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/flvdec.c')
| -rw-r--r-- | libavcodec/flvdec.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index db413f21f2..5b2bed5d94 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -1,5 +1,6 @@ /* * FLV decoding. + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -17,11 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "mpegvideo.h" -#include "h263.h" -#include "flv.h" #include "libavutil/imgutils.h" +#include "flv.h" +#include "h263.h" +#include "mpegvideo.h" + int ff_flv_decode_picture_header(MpegEncContext *s) { int format, width, height; @@ -121,8 +123,6 @@ AVCodec ff_flv_decoder = { .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, .max_lowres = 3, - .pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE - }, + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE }, }; |