avformat/asfdec_f: Increase the amount of information provided in cases of errors

[ffmpeg] / libavformat / movenc.c
diff --git a/libavformat/movenc.c b/libavformat/movenc.c

index 42529ecd5af05ff970455a8e13844f3289dd8e7b..8b7e582768c1057e965c5fc2bc6791d2ef488b89 100644 (file)
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -3116,7 +3116,6 @@ static void mov_write_psp_udta_tag(AVIOContext *pb,
  
  static int mov_write_uuidusmt_tag(AVIOContext *pb, AVFormatContext *s)
  {
-    MOVMuxContext *mov = s->priv_data;
      AVDictionaryEntry *title = av_dict_get(s->metadata, "title", NULL, 0);
      int64_t pos, pos2;
  
@@ -3141,7 +3140,7 @@ static int mov_write_uuidusmt_tag(AVIOContext *pb, AVFormatContext *s)
          avio_wb16(pb, 0x0);                  /* ? */
          avio_wb16(pb, 0x021C);               /* data */
  
-        if (!mov->exact)
+        if (!(s->flags & AVFMT_FLAG_BITEXACT))
              mov_write_psp_udta_tag(pb, LIBAVCODEC_IDENT,      "eng", 0x04);
          mov_write_psp_udta_tag(pb, title->value,          "eng", 0x01);
          mov_write_psp_udta_tag(pb, "2006/04/01 11:11:11", "und", 0x03);
@@ -3276,7 +3275,7 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov)
      avio_printf(pb, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
      avio_printf(pb, "<smil xmlns=\"http://www.w3.org/2001/SMIL20/Language\">\n");
      avio_printf(pb, "<head>\n");
-    if (!mov->exact)
+    if (!(mov->fc->flags & AVFMT_FLAG_BITEXACT))
          avio_printf(pb, "<meta name=\"creator\" content=\"%s\" />\n",
                      LIBAVFORMAT_IDENT);
      avio_printf(pb, "</head>\n");
@@ -4961,9 +4960,6 @@ static int mov_write_header(AVFormatContext *s)
          else if (!strcmp("f4v", s->oformat->name)) mov->mode = MODE_F4V;
      }
  
-    if (s->flags & AVFMT_FLAG_BITEXACT)
-        mov->exact = 1;
-
      if (mov->flags & FF_MOV_FLAG_DELAY_MOOV)
          mov->flags |= FF_MOV_FLAG_EMPTY_MOOV;
  
@@ -5594,7 +5590,7 @@ MOV_CLASS(mp4)
  AVOutputFormat ff_mp4_muxer = {
      .name              = "mp4",
      .long_name         = NULL_IF_CONFIG_SMALL("MP4 (MPEG-4 Part 14)"),
-    .mime_type         = "application/mp4",
+    .mime_type         = "video/mp4",
      .extensions        = "mp4",
      .priv_data_size    = sizeof(MOVMuxContext),
      .audio_codec       = AV_CODEC_ID_AAC,
@@ -5648,7 +5644,7 @@ MOV_CLASS(ipod)
  AVOutputFormat ff_ipod_muxer = {
      .name              = "ipod",
      .long_name         = NULL_IF_CONFIG_SMALL("iPod H.264 MP4 (MPEG-4 Part 14)"),
-    .mime_type         = "application/mp4",
+    .mime_type         = "video/mp4",
      .extensions        = "m4v,m4a",
      .priv_data_size    = sizeof(MOVMuxContext),
      .audio_codec       = AV_CODEC_ID_AAC,
@@ -5666,7 +5662,7 @@ MOV_CLASS(ismv)
  AVOutputFormat ff_ismv_muxer = {
      .name              = "ismv",
      .long_name         = NULL_IF_CONFIG_SMALL("ISMV/ISMA (Smooth Streaming)"),
-    .mime_type         = "application/mp4",
+    .mime_type         = "video/mp4",
      .extensions        = "ismv,isma",
      .priv_data_size    = sizeof(MOVMuxContext),
      .audio_codec       = AV_CODEC_ID_AAC,