diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2011-01-07 19:56:31 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2011-01-07 19:56:31 +0000 |
| commit | a2b7ed3274b2b575f6d2e8fd3bf0a6a1818b2c1e (patch) | |
| tree | 35393dcb995bde9004df2c4324d7acf4ef839a92 | |
| parent | fea714ecd9de557054b2540119f6b5635ba0e636 (diff) | |
| download | ffmpeg-a2b7ed3274b2b575f6d2e8fd3bf0a6a1818b2c1e.tar.gz | |
In mov muxer, override codec tag for dv in mov, fix remuxing from avi
Originally committed as revision 26257 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/movenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 346557677b..5230938872 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -657,7 +657,7 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track) int tag = track->enc->codec_tag; if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL && - (tag == MKTAG('d','v','c','p') || + (track->enc->codec_id == CODEC_ID_DVVIDEO || track->enc->codec_id == CODEC_ID_RAWVIDEO || track->enc->codec_id == CODEC_ID_H263 || av_get_bits_per_sample(track->enc->codec_id)))) { // pcm audio |