aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/iss.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-20 22:41:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-20 22:58:04 +0200
commit349c62410ba92b9513d4a31ec69cbf3ef5240555 (patch)
treee14c0ee0b7ebadc38f86b7393db4d216447e3dd7 /libavformat/iss.c
parent432fe9a38afca9104c1c11942d21739e2a48ba96 (diff)
parent4f04f5cc8b2a590217fe69492da3d65376ebcff3 (diff)
downloadffmpeg-349c62410ba92b9513d4a31ec69cbf3ef5240555.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: indeo: Make ivi_calc_band_checksum() static, it is only used in one file. indeo: Drop unused debug function ivi_check_band(). avcodec/utils: cast a function argument to shut up a compiler warning truemotion1: remove disabled code fix typo in comment fate: fix dependencies for non-SAMPLES avconv tests indeo: check for invalid motion vectors indeo: check that band output buffer exists indeo: clear allocated band buffers indeo: track tile macroblock size indeo: check custom Huffman tables for errors factor out common decoding code for Indeo 4 and Indeo 5 mp3: fix start band index for block type 2 in 8kHz audio lavf: change some (de)muxer names to lowercase lavf: make output format matching case insensitive Conflicts: libavcodec/indeo4.c libavcodec/indeo5.c libavcodec/ivi_common.c libavcodec/utils.c tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/iss.c')
-rw-r--r--libavformat/iss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/iss.c b/libavformat/iss.c
index af2fc6e4ac..f8ec119356 100644
--- a/libavformat/iss.c
+++ b/libavformat/iss.c
@@ -128,7 +128,7 @@ static int iss_read_packet(AVFormatContext *s, AVPacket *pkt)
}
AVInputFormat ff_iss_demuxer = {
- .name = "ISS",
+ .name = "iss",
.long_name = NULL_IF_CONFIG_SMALL("Funcom ISS format"),
.priv_data_size = sizeof(IssDemuxContext),
.read_probe = iss_probe,