diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-01-28 16:58:42 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-01-28 16:58:42 +0000 |
| commit | bbe052463d82044b9765d17cce3abdc185d48e12 (patch) | |
| tree | 52193ba0b35f07dc67ba9185476a9bac0f974370 | |
| parent | ea1664e33a79ea0f963f14c360815c855524c452 (diff) | |
| download | ffmpeg-bbe052463d82044b9765d17cce3abdc185d48e12.tar.gz | |
spoke too fast, fix dv fourcc in mov accordingly if strict
Originally committed as revision 11653 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/movenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 77641b3860..df41b6e96e 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -494,7 +494,8 @@ static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) else if (track->enc->codec_type == CODEC_TYPE_AUDIO) tag = MKTAG('m','p','4','a'); } else if (track->mode == MODE_3GP || track->mode == MODE_3G2) { tag = codec_get_tag(codec_3gp_tags, track->enc->codec_id); - } else if (!tag) { // do not override tag for mov + } else if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL && + tag == MKTAG('d','v','c','p'))) { if (track->enc->codec_id == CODEC_ID_DVVIDEO) { if (track->enc->height == 480) { /* NTSC */ if (track->enc->pix_fmt == PIX_FMT_YUV422P) |