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>

6 files changed, 6 insertions, 6 deletions

diff --git a/libavformat/idroqdec.c b/libavformat/idroqdec.c
index 096ada2ba9..ab3ef96647 100644
--- a/libavformat/idroqdec.c
+++ b/libavformat/idroqdec.c
@@ -220,7 +220,7 @@ static int roq_read_packet(AVFormatContext *s,
 }
 
 AVInputFormat ff_roq_demuxer = {
-    .name           = "RoQ",
+    .name           = "roq",
     .long_name      = NULL_IF_CONFIG_SMALL("id RoQ format"),
     .priv_data_size = sizeof(RoqDemuxContext),
     .read_probe     = roq_probe,
diff --git a/libavformat/idroqenc.c b/libavformat/idroqenc.c
index b8305261fd..dba9c84c20 100644
--- a/libavformat/idroqenc.c
+++ b/libavformat/idroqenc.c
@@ -36,7 +36,7 @@ static int roq_write_header(struct AVFormatContext *s)
 }
 
 AVOutputFormat ff_roq_muxer = {
-    .name         = "RoQ",
+    .name         = "roq",
     .long_name    = NULL_IF_CONFIG_SMALL("raw id RoQ format"),
     .extensions   = "roq",
     .audio_codec  = CODEC_ID_ROQ_DPCM,
diff --git a/libavformat/iff.c b/libavformat/iff.c
index 1890800cf2..2d74472507 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -384,7 +384,7 @@ static int iff_read_packet(AVFormatContext *s,
 }
 
 AVInputFormat ff_iff_demuxer = {
-    .name           = "IFF",
+    .name           = "iff",
     .long_name      = NULL_IF_CONFIG_SMALL("Interchange File Format"),
     .priv_data_size = sizeof(IffDemuxContext),
     .read_probe     = iff_probe,
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,
diff --git a/libavformat/mtv.c b/libavformat/mtv.c
index 6558a230a2..30c8ed7911 100644
--- a/libavformat/mtv.c
+++ b/libavformat/mtv.c
@@ -194,7 +194,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
 }
 
 AVInputFormat ff_mtv_demuxer = {
-    .name           = "MTV",
+    .name           = "mtv",
     .long_name      = NULL_IF_CONFIG_SMALL("MTV format"),
     .priv_data_size = sizeof(MTVDemuxContext),
     .read_probe     = mtv_probe,
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 2d3ec0fb92..8e4d6fcdb3 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -228,7 +228,7 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
     score_max = 0;
     while ((fmt = av_oformat_next(fmt))) {
         score = 0;
-        if (fmt->name && short_name && !strcmp(fmt->name, short_name))
+        if (fmt->name && short_name && !av_strcasecmp(fmt->name, short_name))
             score += 100;
         if (fmt->mime_type && mime_type && !strcmp(fmt->mime_type, mime_type))
             score += 10;