diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-22 00:46:02 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-22 00:46:02 +0200 |
| commit | fccb0a7e45b61128262a396f2426bd7168fd198c (patch) | |
| tree | ac09e6b90d4389717f32181f8b6f3848ffb149fe /libmpcodecs | |
| parent | 71b25cca7644ab059393e9ee4682d79aab41ceba (diff) | |
| parent | ce821bd91f0b0c67b96f5d3b8f3fda19e1015294 (diff) | |
| download | mpv-fccb0a7e45b61128262a396f2426bd7168fd198c.tar.bz2 mpv-fccb0a7e45b61128262a396f2426bd7168fd198c.tar.xz | |
Merge svn changes up to r28176
Conflicts:
libvo/video_out.c
libvo/x11_common.c
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ae_lavc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c index fe18ab786e..b31eb62fce 100644 --- a/libmpcodecs/ae_lavc.c +++ b/libmpcodecs/ae_lavc.c @@ -16,6 +16,7 @@ #include "libaf/af_format.h" #include "libaf/reorder_ch.h" #include "libavcodec/avcodec.h" +#include "libavutil/intreadwrite.h" static AVCodec *lavc_acodec; static AVCodecContext *lavc_actx; @@ -67,8 +68,7 @@ static int bind_lavc(audio_encoder_t *encoder, muxer_stream_t *mux_a) case 0x11: /* imaadpcm */ mux_a->wf->wBitsPerSample = 4; mux_a->wf->cbSize = 2; - ((uint16_t*)mux_a->wf)[sizeof(WAVEFORMATEX)] = - ((lavc_actx->block_align - 4 * lavc_actx->channels) / (4 * lavc_actx->channels)) * 8 + 1; + AV_WL16(mux_a->wf+1, lavc_actx->frame_size); break; case 0x55: /* mp3 */ mux_a->wf->cbSize = 12; |