comparison libmpdemux/demux_mkv.c @ 20477:de4a66d99f41

Libass interface reworked: - ass_instance_t renamed to ass_renderer_t - ass_library_t introduced - use of mplayer-specific global variables limited to ass_mp.c

20476:1fd76553550d

                     name, mime, data_size);
#ifdef USE_ASS
              if (extract_embedded_fonts && name && data && data_size &&
                  mime && (strcmp(mime, "application/x-truetype-font") == 0 ||
                  strcmp(mime, "application/x-font") == 0))
                ass_process_font(name, data, data_size);
#endif
              break;
            }

          default:

      track->sh_sub.type = 'a';

      if (track->subtitle_type == MATROSKA_SUBTYPE_SSA)
        {
      track->sh_sub.ass_track = ass_new_track();
      size = track->private_size;
      m = demux_mkv_decode (track,track->private_data,&buffer,&size,2);
      if (buffer && m)
        {
          free (track->private_data);

        }
      ass_process_codec_private(track->sh_sub.ass_track, track->private_data, track->private_size);
        }
      else
        {
          track->sh_sub.ass_track = ass_default_track();
        }
    }
}
#endif

20477:de4a66d99f41

                     name, mime, data_size);
#ifdef USE_ASS
              if (extract_embedded_fonts && name && data && data_size &&
                  mime && (strcmp(mime, "application/x-truetype-font") == 0 ||
                  strcmp(mime, "application/x-font") == 0))
                ass_process_font(ass_library, name, data, data_size);
#endif
              break;
            }

          default:

      track->sh_sub.type = 'a';

      if (track->subtitle_type == MATROSKA_SUBTYPE_SSA)
        {
      track->sh_sub.ass_track = ass_new_track(ass_library);
      size = track->private_size;
      m = demux_mkv_decode (track,track->private_data,&buffer,&size,2);
      if (buffer && m)
        {
          free (track->private_data);

        }
      ass_process_codec_private(track->sh_sub.ass_track, track->private_data, track->private_size);
        }
      else
        {
          track->sh_sub.ass_track = ass_default_track(ass_library);
        }
    }
}
#endif