X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fdemuxers%2Favi.rs;h=cf1b5bfa5fb1b7ebf4f5aa1c80e53faac5244839;hb=8211e0aadd003c6b02c6f7e8efc9f3930eb9d502;hp=f108e3ccc62adb49cdd9635974a6484956de8051;hpb=dbf1b2e1895c895da8dc6a0878c1d8a351473162;p=nihav.git

diff --git a/nihav-commonfmt/src/demuxers/avi.rs b/nihav-commonfmt/src/demuxers/avi.rs
index f108e3c..cf1b5bf 100644
--- a/nihav-commonfmt/src/demuxers/avi.rs
+++ b/nihav-commonfmt/src/demuxers/avi.rs
@@ -154,6 +154,12 @@ impl<'a> DemuxCore<'a> for AVIDemuxer<'a> {
     }
 }
 
+impl<'a> NAOptionHandler for AVIDemuxer<'a> {
+    fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+    fn set_options(&mut self, _options: &[NAOption]) { }
+    fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
+}
+
 impl<'a> AVIDemuxer<'a> {
     fn new(io: &'a mut ByteReader<'a>) -> Self {
         AVIDemuxer {
@@ -448,7 +454,14 @@ fn parse_strf_auds(dmx: &mut AVIDemuxer, strmgr: &mut StreamManager, size: usize
 
     let soniton = NASoniton::new(bits_per_sample as u8, SONITON_FLAG_SIGNED);
     let ahdr = NAAudioInfo::new(samplespersec, channels as u8, soniton, block_align as usize);
-    let edata = dmx.read_extradata(size - 16)?;
+    let edata;
+    if size > 16 {
+        let edata_size      = dmx.src.read_u16le()? as usize;
+        validate!(edata_size + 18 == size);
+        edata = dmx.read_extradata(size - 18)?;
+    } else {
+        edata = None;
+    }
     let cname = match register::find_codec_from_wav_twocc(w_format_tag) {
                     None => "unknown",
                     Some(name) => name,