diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-04 01:40:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-04 01:40:29 +0200 |
| commit | 64160ef39216b2d40eb34c13421febe045ddcf8a (patch) | |
| tree | f5d63c19adb037a18baf2689f503f165b9c39aaf /libavcodec/xsubdec.c | |
| parent | 72b0c9f55f26049e22bf147ab120173bd1d54cd5 (diff) | |
| parent | fed6c90b68fa00ad399e0b6d51c1e41d0d3730a0 (diff) | |
| download | ffmpeg-64160ef39216b2d40eb34c13421febe045ddcf8a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cosmetics: remove some stray comments from AVCodec declarations
cosmetics: fix indentation/alignment in AVCodec declarations
arm: Avoid using the movw instruction needlessly
Move an int64_t down in MpegEncContext
Conflicts:
libavcodec/arm/ac3dsp_armv6.S
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xsubdec.c')
| -rw-r--r-- | libavcodec/xsubdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c index 448c3dd823..5e0e59faa4 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -136,10 +136,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, } AVCodec ff_xsub_decoder = { - .name = "xsub", - .type = AVMEDIA_TYPE_SUBTITLE, - .id = CODEC_ID_XSUB, - .init = decode_init, - .decode = decode_frame, + .name = "xsub", + .type = AVMEDIA_TYPE_SUBTITLE, + .id = CODEC_ID_XSUB, + .init = decode_init, + .decode = decode_frame, .long_name = NULL_IF_CONFIG_SMALL("XSUB"), }; |