opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-06 15:49:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2011-08-04 01:40:29 +02:00
parent 72b0c9f55f fed6c90b68
commit 64160ef392
9 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/xsubdec.c
View File

@ -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"),
};