diff options
| author | Martin Storsjö <martin@martin.st> | 2012-03-22 13:31:31 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-03-25 01:06:49 +0200 |
| commit | 68893afe1d4583038d3788b6c3e462e42ce6074d (patch) | |
| tree | 2ebf71a0a923dcae13401979f46593d690da0a13 /libavformat | |
| parent | cb3486778044e580ef38a8d861af4a2e42336866 (diff) | |
movenc: Merge if statements
This isn't exactly equivalent with the earlier code for codecs
other than H264 and VC1, but those are two only codecs supported
by this codepath anyway, and it simplifies it a bit.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index a832c1d102..1d808f128f 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2147,14 +2147,11 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov) size); av_free(ptr); } - } else { - param_write_hex(pb, "CodecPrivateData", track->enc->extradata, - track->enc->extradata_size); - } - if (track->enc->codec_id == CODEC_ID_H264) { param_write_string(pb, "FourCC", "H264"); } else if (track->enc->codec_id == CODEC_ID_VC1) { param_write_string(pb, "FourCC", "WVC1"); + param_write_hex(pb, "CodecPrivateData", track->enc->extradata, + track->enc->extradata_size); } param_write_int(pb, "MaxWidth", track->enc->width); param_write_int(pb, "MaxHeight", track->enc->height); |