diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2011-01-07 19:55:08 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2011-01-07 19:55:08 +0000 |
| commit | 10d8eac98dba2c5652d74df478f0f8dc8f3f57f3 (patch) | |
| tree | c65954ead0734d64eb0c27bffd4da58891c31f24 /libavformat | |
| parent | 2a127067109b03b32054463a7401150171b6b578 (diff) | |
| download | ffmpeg-10d8eac98dba2c5652d74df478f0f8dc8f3f57f3.tar.gz | |
In mov muxer, override codec tag for h263 in mov, fix remuxing from 3gp
Originally committed as revision 26255 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index b1ad714267..346557677b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -659,6 +659,7 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track) 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_H263 || av_get_bits_per_sample(track->enc->codec_id)))) { // pcm audio if (track->enc->codec_id == CODEC_ID_DVVIDEO) tag = mov_get_dv_codec_tag(s, track); |