projects
/
nihav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3167c45
)
fix warnings
author
Kostya Shishkov
<kostya.shishkov@gmail.com>
Fri, 18 Jan 2019 09:19:31 +0000
(10:19 +0100)
committer
Kostya Shishkov
<kostya.shishkov@gmail.com>
Fri, 18 Jan 2019 09:19:31 +0000
(10:19 +0100)
nihav-commonfmt/src/demuxers/mod.rs
patch
|
blob
|
blame
|
history
nihav-core/src/codecs/mod.rs
patch
|
blob
|
blame
|
history
nihav-core/src/demuxers/mod.rs
patch
|
blob
|
blame
|
history
nihav-game/src/demuxers/mod.rs
patch
|
blob
|
blame
|
history
diff --git
a/nihav-commonfmt/src/demuxers/mod.rs
b/nihav-commonfmt/src/demuxers/mod.rs
index fa388e3103409cd5b9dab33c51de0277a92a58f1..84d21f049f0839b72ea548f3d0e0204845901901 100644
(file)
--- a/
nihav-commonfmt/src/demuxers/mod.rs
+++ b/
nihav-commonfmt/src/demuxers/mod.rs
@@
-1,6
+1,7
@@
use nihav_core::demuxers::*;
use nihav_core::demuxers::*;
+#[allow(unused_macros)]
macro_rules! validate {
($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DemuxerError::InvalidData); } };
}
macro_rules! validate {
($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DemuxerError::InvalidData); } };
}
diff --git
a/nihav-core/src/codecs/mod.rs
b/nihav-core/src/codecs/mod.rs
index 76c683d0a9adae6cb7d0fd97fe9a2e37b7e42961..4edb2ee8aa97254e845bc96ad9087e7574d114e5 100644
(file)
--- a/
nihav-core/src/codecs/mod.rs
+++ b/
nihav-core/src/codecs/mod.rs
@@
-3,7
+3,6
@@
use std::ops::{Add, AddAssign, Sub, SubAssign};
use crate::frame::*;
use std::rc::Rc;
use crate::frame::*;
use std::rc::Rc;
-use std::cell::RefCell;
use std::mem;
use crate::io::byteio::ByteIOError;
use crate::io::bitreader::BitReaderError;
use std::mem;
use crate::io::byteio::ByteIOError;
use crate::io::bitreader::BitReaderError;
@@
-45,10
+44,6
@@
impl From<AllocatorError> for DecoderError {
fn from(_: AllocatorError) -> Self { DecoderError::AllocError }
}
fn from(_: AllocatorError) -> Self { DecoderError::AllocError }
}
-macro_rules! validate {
- ($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DecoderError::InvalidData); } };
-}
-
#[allow(dead_code)]
pub struct HAMShuffler {
lastframe: Option<NAVideoBuffer<u8>>,
#[allow(dead_code)]
pub struct HAMShuffler {
lastframe: Option<NAVideoBuffer<u8>>,
diff --git
a/nihav-core/src/demuxers/mod.rs
b/nihav-core/src/demuxers/mod.rs
index bfd492ae966c763b16df55a37db28d857040b016..86de78de260044d8f03acaae512c523e13d85041 100644
(file)
--- a/
nihav-core/src/demuxers/mod.rs
+++ b/
nihav-core/src/demuxers/mod.rs
@@
-200,10
+200,6
@@
pub trait DemuxerCreator {
fn get_name(&self) -> &'static str;
}
fn get_name(&self) -> &'static str;
}
-macro_rules! validate {
- ($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DemuxerError::InvalidData); } };
-}
-
pub fn create_demuxer<'a>(dmxcr: &DemuxerCreator, br: &'a mut ByteReader<'a>) -> DemuxerResult<Demuxer<'a>> {
let mut dmx = dmxcr.new_demuxer(br);
let mut str = StreamManager::new();
pub fn create_demuxer<'a>(dmxcr: &DemuxerCreator, br: &'a mut ByteReader<'a>) -> DemuxerResult<Demuxer<'a>> {
let mut dmx = dmxcr.new_demuxer(br);
let mut str = StreamManager::new();
diff --git
a/nihav-game/src/demuxers/mod.rs
b/nihav-game/src/demuxers/mod.rs
index f2aeb3b8e2a2a6cdb4d216103651fa17b1013956..8f9b384a03254fff4b2498bb63060e50c498e4b0 100644
(file)
--- a/
nihav-game/src/demuxers/mod.rs
+++ b/
nihav-game/src/demuxers/mod.rs
@@
-1,5
+1,6
@@
use nihav_core::demuxers::*;
use nihav_core::demuxers::*;
+#[allow(unused_macros)]
macro_rules! validate {
($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DemuxerError::InvalidData); } };
}
macro_rules! validate {
($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DemuxerError::InvalidData); } };
}