aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/tscc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-08-04 01:40:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-08-04 01:40:29 +0200
commit64160ef39216b2d40eb34c13421febe045ddcf8a (patch)
treef5d63c19adb037a18baf2689f503f165b9c39aaf /libavcodec/tscc.c
parent72b0c9f55f26049e22bf147ab120173bd1d54cd5 (diff)
parentfed6c90b68fa00ad399e0b6d51c1e41d0d3730a0 (diff)
downloadffmpeg-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/tscc.c')
-rw-r--r--libavcodec/tscc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c
index 00638007d2..54c008714f 100644
--- a/libavcodec/tscc.c
+++ b/libavcodec/tscc.c
@@ -208,6 +208,6 @@ AVCodec ff_tscc_decoder = {
.close = decode_end,
.decode = decode_frame,
.capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"),
+ .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"),
};