From 6644a91da4ec561dd9213e3d90f1b48368822fea Mon Sep 17 00:00:00 2001
From: Zhiming Wang <i@zhimingwang.org>
Date: Mon, 1 Jun 2020 13:06:34 +0800
Subject: [PATCH] Update bitflags to 1.2 and fix namespacing

---
 Cargo.toml                         | 2 +-
 src/codec/audio.rs                 | 2 +-
 src/codec/packet/packet.rs         | 6 +++---
 src/software/mod.rs                | 2 +-
 src/software/scaling/extensions.rs | 8 ++++----
 src/util/frame/mod.rs              | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 01859e8..e10b0dc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -94,7 +94,7 @@ software-scaling    = ["ffmpeg-sys/swscale", "codec"]
 
 [dependencies]
 libc     = "0.2"
-bitflags = "0.9"
+bitflags = "1.2"
 
 [dependencies.image]
 version  = "0.12"
diff --git a/src/codec/audio.rs b/src/codec/audio.rs
index f2f5fdd..f0f2c4a 100644
--- a/src/codec/audio.rs
+++ b/src/codec/audio.rs
@@ -121,7 +121,7 @@ impl ChannelLayoutIter {
     }
 
     pub fn best(self, max: i32) -> ChannelLayout {
-        self.fold(::channel_layout::MONO, |acc, cur| {
+        self.fold(ChannelLayout::MONO, |acc, cur| {
             if cur.channels() > acc.channels() && cur.channels() <= max {
                 cur
             } else {
diff --git a/src/codec/packet/packet.rs b/src/codec/packet/packet.rs
index a63bf9c..c2649c5 100644
--- a/src/codec/packet/packet.rs
+++ b/src/codec/packet/packet.rs
@@ -2,7 +2,7 @@ use std::marker::PhantomData;
 use std::mem;
 use std::slice;
 
-use super::{flag, Borrow, Flags, Mut, Ref, SideData};
+use super::{Borrow, Flags, Mut, Ref, SideData};
 use ffi::*;
 use libc::c_int;
 use {format, Error, Rational};
@@ -99,12 +99,12 @@ impl Packet {
 
     #[inline]
     pub fn is_key(&self) -> bool {
-        self.flags().contains(flag::KEY)
+        self.flags().contains(Flags::KEY)
     }
 
     #[inline]
     pub fn is_corrupt(&self) -> bool {
-        self.flags().contains(flag::CORRUPT)
+        self.flags().contains(Flags::CORRUPT)
     }
 
     #[inline]
diff --git a/src/software/mod.rs b/src/software/mod.rs
index c6c08a8..94bb11a 100644
--- a/src/software/mod.rs
+++ b/src/software/mod.rs
@@ -28,7 +28,7 @@ pub fn converter(
         output,
         width,
         height,
-        scaling::flag::FAST_BILINEAR,
+        scaling::flag::Flags::FAST_BILINEAR,
     )
 }
 
diff --git a/src/software/scaling/extensions.rs b/src/software/scaling/extensions.rs
index 2079713..94faf33 100644
--- a/src/software/scaling/extensions.rs
+++ b/src/software/scaling/extensions.rs
@@ -1,4 +1,4 @@
-use super::{flag, Context, Flags};
+use super::{Context, Flags};
 use util::format;
 use {decoder, frame, Error, Picture};
 
@@ -25,7 +25,7 @@ impl<'a> Picture<'a> {
             format,
             self.width(),
             self.height(),
-            flag::FAST_BILINEAR,
+            Flags::FAST_BILINEAR,
         )
     }
 }
@@ -53,7 +53,7 @@ impl frame::Video {
             format,
             self.width(),
             self.height(),
-            flag::FAST_BILINEAR,
+            Flags::FAST_BILINEAR,
         )
     }
 }
@@ -81,7 +81,7 @@ impl decoder::Video {
             format,
             self.width(),
             self.height(),
-            flag::FAST_BILINEAR,
+            Flags::FAST_BILINEAR,
         )
     }
 }
diff --git a/src/util/frame/mod.rs b/src/util/frame/mod.rs
index 4c3eaca..204ab2a 100644
--- a/src/util/frame/mod.rs
+++ b/src/util/frame/mod.rs
@@ -75,7 +75,7 @@ impl Frame {
 
     #[inline]
     pub fn is_corrupt(&self) -> bool {
-        self.flags().contains(flag::CORRUPT)
+        self.flags().contains(Flags::CORRUPT)
     }
 
     #[inline]