diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 22:27:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 22:29:27 +0200 |
| commit | 5771efde87c17e1ecda4db32437d16d108c61be2 (patch) | |
| tree | b4600c7b2ab783c78159e015bf1643fbbcf9436d | |
| parent | bbee02ed9c186c1bb1fc0c3bcf79e78af978ae6a (diff) | |
| parent | 0ba5299a805e9ccaef1a757381fc2ada4d54b8a1 (diff) | |
Merge commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1'
* commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1':
movenc: use the "encoder" metadata tag to write stsd Compressorname
Conflicts:
libavformat/movenc.c
libavformat/movenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/movenc.c | 8 | ||||
| -rw-r--r-- | libavformat/movenc.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index adcbcf2c0f..12111cb86e 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1184,12 +1184,14 @@ static int mov_write_pasp_tag(AVIOContext *pb, MOVTrack *track) static void find_compressor(char * compressor_name, int len, MOVTrack *track) { + AVDictionaryEntry *encoder; int xdcam_res = (track->enc->width == 1280 && track->enc->height == 720) || (track->enc->width == 1440 && track->enc->height == 1080) || (track->enc->width == 1920 && track->enc->height == 1080); - if (track->mode == MODE_MOV && track->enc->codec && track->enc->codec->name) { - av_strlcpy(compressor_name, track->enc->codec->name, 32); + if (track->mode == MODE_MOV && + (encoder = av_dict_get(track->st->metadata, "encoder", NULL, 0))) { + av_strlcpy(compressor_name, encoder->value, 32); } else if (track->enc->codec_id == AV_CODEC_ID_MPEG2VIDEO && xdcam_res) { int interlaced = track->enc->field_order > AV_FIELD_PROGRESSIVE; AVStream *st = track->st; @@ -3984,8 +3986,8 @@ static int mov_write_header(AVFormatContext *s) MOVTrack *track= &mov->tracks[i]; AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL,0); + track->st = st; track->enc = st->codec; - track->st = st; track->language = ff_mov_iso639_to_lang(lang?lang->value:"und", mov->mode!=MODE_MOV); if (track->language < 0) track->language = 0; diff --git a/libavformat/movenc.h b/libavformat/movenc.h index fce2d3c932..be0a851d12 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -98,7 +98,7 @@ typedef struct MOVTrack { int language; int track_id; int tag; ///< stsd fourcc - AVStream *st; + AVStream *st; AVCodecContext *enc; int vos_len; |