diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-25 23:10:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-25 23:10:30 +0200 |
| commit | 9621646eb316d7595f0f8198efd39f36efa30440 (patch) | |
| tree | 8cc20303687a958f7a1530e14c65e9eadd54be8f /libavformat | |
| parent | 8d7f2db60a9cc2b6fd87a410a69f4deafa3edff9 (diff) | |
| parent | 62ce9defb81d0b6bd179131d1502858c8778f411 (diff) | |
| download | ffmpeg-9621646eb316d7595f0f8198efd39f36efa30440.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: prettyprint gcc inline asm
x86: K&R prettyprinting cosmetics for dsputil_mmx.c
x86: conditionally compile H.264 QPEL optimizations
dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.
Ignore generated files below doc/.
dpcm: convert to bytestream2.
interplayvideo: convert to bytestream2.
movenc: Merge if statements
h264: fix memleak in error path.
pthread: Immediately release all frames in ff_thread_flush()
h264: Add check for invalid chroma_format_idc
utvideo: port header reading to bytestream2.
Conflicts:
.gitignore
configure
libavcodec/h264_ps.c
libavcodec/interplayvideo.c
libavcodec/pthread.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 9a8c38d097..f0b606e0fc 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2209,14 +2209,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); |