virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '18f2514c4037befd37b02e4d4f10c159edf3b26f'

Browse Source 
* commit '18f2514c4037befd37b02e4d4f10c159edf3b26f':
  mov: export stsd Compressorname in metadata

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-05-01 17:13:05 +02:00
parent e77b9853ea 18f2514c40
commit 7426acff1a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mov.c
View File

@@ -1208,6 +1208,7 @@ static int mov_codec_id(AVStream *st, uint32_t format)
static void mov_parse_stsd_video(MOVContext *c, AVIOContext *pb, static void mov_parse_stsd_video(MOVContext *c, AVIOContext *pb,
AVStream *st, MOVStreamContext *sc) AVStream *st, MOVStreamContext *sc)
{ {
uint8_t codec_name[32];
unsigned int color_depth, len, j; unsigned int color_depth, len, j;
int color_greyscale; int color_greyscale;
int color_table_id; int color_table_id;
@@ -1229,18 +1230,22 @@ static void mov_parse_stsd_video(MOVContext *c, AVIOContext *pb,
len = avio_r8(pb); /* codec name, pascal string */ len = avio_r8(pb); /* codec name, pascal string */
if (len > 31) if (len > 31)
len = 31; len = 31;
mov_read_mac_string(c, pb, len, st->codec->codec_name, 32); mov_read_mac_string(c, pb, len, codec_name, sizeof(codec_name));
if (len < 31) if (len < 31)
avio_skip(pb, 31 - len); avio_skip(pb, 31 - len);
if (codec_name[0])
av_dict_set(&st->metadata, "encoder", codec_name, 0);
/* codec_tag YV12 triggers an UV swap in rawdec.c */ /* codec_tag YV12 triggers an UV swap in rawdec.c */
if (!memcmp(st->codec->codec_name, "Planar Y'CbCr 8-bit 4:2:0", 25)) { if (!memcmp(codec_name, "Planar Y'CbCr 8-bit 4:2:0", 25)) {
st->codec->codec_tag = MKTAG('I', '4', '2', '0'); st->codec->codec_tag = MKTAG('I', '4', '2', '0');
st->codec->width &= ~1; st->codec->width &= ~1;
st->codec->height &= ~1; st->codec->height &= ~1;
} }
/* Flash Media Server uses tag H263 with Sorenson Spark */ /* Flash Media Server uses tag H263 with Sorenson Spark */
if (st->codec->codec_tag == MKTAG('H','2','6','3') && if (st->codec->codec_tag == MKTAG('H','2','6','3') &&
!memcmp(st->codec->codec_name, "Sorenson H263", 13)) !memcmp(codec_name, "Sorenson H263", 13))
st->codec->codec_id = AV_CODEC_ID_FLV1; st->codec->codec_id = AV_CODEC_ID_FLV1;
st->codec->bits_per_coded_sample = avio_rb16(pb); /* depth */ st->codec->bits_per_coded_sample = avio_rb16(pb); /* depth */