har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '6f26f14f134e753d6168591f30815b1c08c1498b'

Browse Source 
* commit '6f26f14f134e753d6168591f30815b1c08c1498b':
  sidxindex: Write mimeType=audio/mp4 for audio-only representations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-24 14:01:23 +01:00
commit 7a19a8fb69
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/sidxindex.c
View File

@ -327,7 +327,7 @@ static int output_mpd(struct Tracks *tracks, const char *filename)
for (i = 0; i < nb_tracks[set]; ) { for (i = 0; i < nb_tracks[set]; ) {
struct Track *first_track = adaptation_sets[set][i]; struct Track *first_track = adaptation_sets[set][i];
int width = 0, height = 0, sample_rate = 0, channels = 0, bitrate = 0; int width = 0, height = 0, sample_rate = 0, channels = 0, bitrate = 0;
fprintf(out, "\t\t\t<Representation id=\"%d\" mimeType=\"video/mp4\" codecs=\"", i); fprintf(out, "\t\t\t<Representation id=\"%d\" codecs=\"", i);
for (j = i; j < nb_tracks[set]; j++) { for (j = i; j < nb_tracks[set]; j++) {
struct Track *track = adaptation_sets[set][j]; struct Track *track = adaptation_sets[set][j];
if (strcmp(track->name, first_track->name)) if (strcmp(track->name, first_track->name))
@ -345,7 +345,8 @@ static int output_mpd(struct Tracks *tracks, const char *filename)
fprintf(out, ","); fprintf(out, ",");
fprintf(out, "%s", track->codec_str); fprintf(out, "%s", track->codec_str);
} }
fprintf(out, "\" bandwidth=\"%d\"", bitrate); fprintf(out, "\" mimeType=\"%s/mp4\" bandwidth=\"%d\"",
width ? "video" : "audio", bitrate);
if (width > 0 && height > 0) if (width > 0 && height > 0)
fprintf(out, " width=\"%d\" height=\"%d\"", width, height); fprintf(out, " width=\"%d\" height=\"%d\"", width, height);
if (sample_rate > 0) if (sample_rate > 0)