diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-25 20:48:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-25 21:06:14 +0200 |
| commit | c0b47d1914a19abacdf1edf081cbf07485952920 (patch) | |
| tree | 94b26fadd3ecf4352ff87bd807ea6124bc2f4c02 /libavformat/movenc.c | |
| parent | e02e58fb1c108dd96ef5b61454a2ba8d2af895ea (diff) | |
| parent | ed7bdd8647a3d0f534c2af0d244fc8744ff262a0 (diff) | |
| download | ffmpeg-c0b47d1914a19abacdf1edf081cbf07485952920.tar.gz | |
Merge remote-tracking branch 'qatar/master'n0.12-dev
* qatar/master:
movenc: Don't write the 'wave' atom or its child 'enda' for lpcm audio.
imc: some cosmetics
rtmp: Pass the proper return code in rtmp_handshake
rtmp: Check return codes of net IO operations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 752d52713a..aaf8152cf7 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -680,7 +680,7 @@ static int mov_write_audio_tag(AVIOContext *pb, MOVTrack *track) track->enc->codec_id == CODEC_ID_ALAC || track->enc->codec_id == CODEC_ID_ADPCM_MS || track->enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || - mov_pcm_le_gt16(track->enc->codec_id))) + (mov_pcm_le_gt16(track->enc->codec_id) && version==1))) mov_write_wave_tag(pb, track); else if(track->tag == MKTAG('m','p','4','a')) mov_write_esds_tag(pb, track); |