diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-04-07 20:37:30 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-04-07 20:37:30 +0000 |
| commit | 50d2d05d3436922e89fcdfdd87411669eab61c02 (patch) | |
| tree | 382db8bb8278f44cabf04afd3401c5ba39744264 /libavformat | |
| parent | f0ed92df60e47c9bcc68f001006ec11ccd87cd58 (diff) | |
| download | ffmpeg-50d2d05d3436922e89fcdfdd87411669eab61c02.tar.gz | |
override mov fourcc for pcm audio, this is safer when stream copying
Originally committed as revision 18355 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -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 fe74cd04f6..2c159e1d76 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -602,7 +602,8 @@ static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) tag = codec_get_tag(codec_3gp_tags, track->enc->codec_id); } else if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL && (tag == MKTAG('d','v','c','p') || - track->enc->codec_id == CODEC_ID_RAWVIDEO))) { + track->enc->codec_id == CODEC_ID_RAWVIDEO || + av_get_bits_per_sample(track->enc->codec_id)))) { // pcm audio if (track->enc->codec_id == CODEC_ID_DVVIDEO) { if (track->enc->height == 480) /* NTSC */ if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','n'); |