Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'

* commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58':
  bmv: Split audio and video decoder

Conflicts:
	libavcodec/bmvvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/Makefile
index 8e4c27e84285df63b04abbafa28950d59fd91d2b,0440b941500386ebfe7e8323554f99c56941a9b3..7a1640a60da82551b2fae08047d2e0c5b57067a4
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -156,11 -130,10 +156,11 @@@ OBJS-$(CONFIG_BFI_DECODER)             
  OBJS-$(CONFIG_BINK_DECODER)            += bink.o binkdsp.o
  OBJS-$(CONFIG_BINKAUDIO_DCT_DECODER)   += binkaudio.o wma.o wma_common.o
  OBJS-$(CONFIG_BINKAUDIO_RDFT_DECODER)  += binkaudio.o wma.o wma_common.o
 +OBJS-$(CONFIG_BINTEXT_DECODER)         += bintext.o cga_data.o
  OBJS-$(CONFIG_BMP_DECODER)             += bmp.o msrledec.o
  OBJS-$(CONFIG_BMP_ENCODER)             += bmpenc.o
- OBJS-$(CONFIG_BMV_VIDEO_DECODER)       += bmv.o
- OBJS-$(CONFIG_BMV_AUDIO_DECODER)       += bmv.o
+ OBJS-$(CONFIG_BMV_AUDIO_DECODER)       += bmvaudio.o
+ OBJS-$(CONFIG_BMV_VIDEO_DECODER)       += bmvvideo.o
  OBJS-$(CONFIG_BRENDER_PIX_DECODER)     += brenderpix.o
  OBJS-$(CONFIG_C93_DECODER)             += c93.o
  OBJS-$(CONFIG_CAVS_DECODER)            += cavs.o cavsdec.o cavsdsp.o \

diff --cc libavcodec/bmvaudio.c
index 0000000000000000000000000000000000000000,0f8c2249b2028b547d1f05facc7455c82f5adb8b..0e473df90c3c375310f4427e6786f18f894c8f44
mode 000000,100644..100644
--- /dev/null
--- 2/libavcodec/bmvaudio.c
+++ b/libavcodec/bmvaudio.c
@@@ -1,0 -1,91 +1,89 @@@
 - * This file is part of Libav.
+ /*
+  * Discworld II BMV audio decoder
+  * Copyright (c) 2011 Konstantin Shishkov
+  *
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * FFmpeg is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+  * version 2.1 of the License, or (at your option) any later version.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
 -    if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
 -        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+ #include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ 
+ #include "avcodec.h"
+ #include "internal.h"
+ 
+ static const int bmv_aud_mults[16] = {
+     16512, 8256, 4128, 2064, 1032, 516, 258, 192, 129, 88, 64, 56, 48, 40, 36, 32
+ };
+ 
+ static av_cold int bmv_aud_decode_init(AVCodecContext *avctx)
+ {
+     avctx->channels       = 2;
+     avctx->channel_layout = AV_CH_LAYOUT_STEREO;
+     avctx->sample_fmt     = AV_SAMPLE_FMT_S16;
+ 
+     return 0;
+ }
+ 
+ static int bmv_aud_decode_frame(AVCodecContext *avctx, void *data,
+                                 int *got_frame_ptr, AVPacket *avpkt)
+ {
+     AVFrame *frame     = data;
+     const uint8_t *buf = avpkt->data;
+     int buf_size = avpkt->size;
+     int blocks = 0, total_blocks, i;
+     int ret;
+     int16_t *output_samples;
+     int scale[2];
+ 
+     total_blocks = *buf++;
+     if (buf_size < total_blocks * 65 + 1) {
+         av_log(avctx, AV_LOG_ERROR, "expected %d bytes, got %d\n",
+                total_blocks * 65 + 1, buf_size);
+         return AVERROR_INVALIDDATA;
+     }
+ 
+     /* get output buffer */
+     frame->nb_samples = total_blocks * 32;
 -    }
++    if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
+         return ret;
+     output_samples = (int16_t *)frame->data[0];
+ 
+     for (blocks = 0; blocks < total_blocks; blocks++) {
+         uint8_t code = *buf++;
+         code = (code >> 1) | (code << 7);
+         scale[0] = bmv_aud_mults[code & 0xF];
+         scale[1] = bmv_aud_mults[code >> 4];
+         for (i = 0; i < 32; i++) {
+             *output_samples++ = av_clip_int16((scale[0] * (int8_t)*buf++) >> 5);
+             *output_samples++ = av_clip_int16((scale[1] * (int8_t)*buf++) >> 5);
+         }
+     }
+ 
+     *got_frame_ptr = 1;
+ 
+     return buf_size;
+ }
+ 
+ AVCodec ff_bmv_audio_decoder = {
+     .name           = "bmv_audio",
+     .long_name      = NULL_IF_CONFIG_SMALL("Discworld II BMV audio"),
+     .type           = AVMEDIA_TYPE_AUDIO,
+     .id             = AV_CODEC_ID_BMV_AUDIO,
+     .init           = bmv_aud_decode_init,
+     .decode         = bmv_aud_decode_frame,
+     .capabilities   = CODEC_CAP_DR1,
+ };

diff --cc libavcodec/bmvvideo.c
index baa1c8b6f76405666f589987025396bcd4a49bbb,ebc8e7a082f46d28f0e8ddc2b2a321c05c288fb1..5143b2a76b352a2f77ac93f8f50da93eff790316
--- 1/libavcodec/bmv.c
--- 2/libavcodec/bmvvideo.c
+++ b/libavcodec/bmvvideo.c
@@@ -1,10 -1,10 +1,10 @@@
  /*
-  * Discworld II BMV video and audio decoder
+  * Discworld II BMV video decoder
   * Copyright (c) 2011 Konstantin Shishkov
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.
@@@ -19,8 -19,8 +19,9 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
- #include "libavutil/channel_layout.h"
 +#include "libavutil/avassert.h"
+ #include "libavutil/common.h"
+ 
  #include "avcodec.h"
  #include "bytestream.h"
  #include "internal.h"