[FFmpeg-cvslog] avformat/genh: add ADPCM IMA DVI support

Paul B Mahol git at videolan.org
Fri Oct 23 21:13:08 CEST 2015


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Oct 23 21:09:49 2015 +0200| [daabc59c645c0933f5b809981cef640c63c2cedb] | committer: Paul B Mahol

avformat/genh: add ADPCM IMA DVI support

Our decoder have wrong name.

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=daabc59c645c0933f5b809981cef640c63c2cedb
---

 libavformat/genh.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavformat/genh.c b/libavformat/genh.c
index 3a4faf9..6e4abae 100644
--- a/libavformat/genh.c
+++ b/libavformat/genh.c
@@ -41,7 +41,7 @@ static int genh_read_header(AVFormatContext *s)
     unsigned start_offset, header_size, codec, coef_type, coef[2];
     GENHDemuxContext *c = s->priv_data;
     unsigned coef_splitted[2];
-    int align, ch;
+    int align, ch, ret;
     AVStream *st;
 
     avio_skip(s->pb, 4);
@@ -84,6 +84,11 @@ static int genh_read_header(AVFormatContext *s)
     case  5: st->codec->codec_id = st->codec->block_align > 0 ?
                                    AV_CODEC_ID_PCM_S8_PLANAR :
                                    AV_CODEC_ID_PCM_S8;           break;
+    case  7: ret = ff_alloc_extradata(st->codec, 2);
+             if (ret < 0)
+                 return ret;
+             AV_WL16(st->codec->extradata, 3);
+             st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_WS;     break;
     case 12: st->codec->codec_id = AV_CODEC_ID_ADPCM_THP;        break;
     case 13: st->codec->codec_id = AV_CODEC_ID_PCM_U8;           break;
     case 17: st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_QT;     break;



More information about the ffmpeg-cvslog mailing list