diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-17 00:35:06 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-17 00:35:06 +0100 |
commit | 8c1ebdcea2d3f84bd5c01ce3dce5e619c845bc0f (patch) | |
tree | 977c2d42de80b6c292ff0f9ad79f14762ba792f6 /libavformat/movenc.c | |
parent | 7bdefc0f1281c2c18375197985fcd5109e711829 (diff) | |
parent | 204cb29b3c84a74cbcd059d353c70c8bdc567d98 (diff) | |
download | ffmpeg-8c1ebdcea2d3f84bd5c01ce3dce5e619c845bc0f.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
shorten: Use separate pointers for the allocated memory for decoded samples.
atrac3: Fix crash in tonal component decoding.
ws_snd1: Fix wrong samples counts.
movenc: Don't set a default sample duration when creating ismv
rtp: Factorize the check for distinguishing RTCP packets from RTP
golomb: avoid infinite loop on all-zero input (or end of buffer).
bethsoftvid: synchronize video timestamps with audio sample rate
bethsoftvid: add audio stream only after getting the first audio packet
bethsoftvid: Set video packet duration instead of accumulating pts.
bethsoftvid: set packet key frame flag for audio and I-frame video packets.
bethsoftvid: fix read_packet() return codes.
bethsoftvid: pass palette in side data instead of in a separate packet.
sdp: Ignore RTCP packets when autodetecting RTP streams
proresenc: initialise 'sign' variable
mpegaudio: replace memcpy by SIMD code
vc1: prevent using last_frame as a reference for I/P first frame.
Conflicts:
libavcodec/atrac3.c
libavcodec/golomb.h
libavcodec/shorten.c
libavcodec/ws-snd1.c
tests/ref/fate/bethsoft-vid
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.c')
-rw-r--r-- | libavformat/movenc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 449c641e6e..2c96f34a6b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2230,10 +2230,11 @@ static int mov_write_tfhd_tag(AVIOContext *pb, MOVTrack *track, flags |= 0x20; /* default-sample-flags-present */ } - /* Don't set a default sample size when creating data for silverlight, - * the player refuses to play files with that set. */ + /* Don't set a default sample size, the silverlight player refuses + * to play files with that set. Don't set a default sample duration, + * WMP freaks out if it is set. */ if (track->mode == MODE_ISM) - flags &= ~0x10; + flags &= ~0x18; avio_wb32(pb, 0); /* size placeholder */ ffio_wfourcc(pb, "tfhd"); |