[FFmpeg-cvslog] Merge commit '197ae68e78784524a7ccf97a3c301092715305d3'

Clément Bœsch git at videolan.org
Wed Jun 29 11:55:29 CEST 2016


ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Wed Jun 29 11:52:34 2016 +0200| [4b9574b275c24404093061b35b910b8ce1fa86b9] | committer: Clément Bœsch

Merge commit '197ae68e78784524a7ccf97a3c301092715305d3'

* commit '197ae68e78784524a7ccf97a3c301092715305d3':
  Drop unnecessary unary.h #includes

Merged-by: Clément Bœsch <clement at stupeflix.com>

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

 libavcodec/h263.c       |    1 -
 libavcodec/ituh263enc.c |    1 -
 libavcodec/on2avc.c     |    1 -
 3 files changed, 3 deletions(-)

diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 4720c56..0855ee7 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -35,7 +35,6 @@
 #include "h263data.h"
 #include "mathops.h"
 #include "mpegutils.h"
-#include "unary.h"
 #include "flv.h"
 #include "mpeg4video.h"
 
diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c
index a8bfe91..ee09f29 100644
--- a/libavcodec/ituh263enc.c
+++ b/libavcodec/ituh263enc.c
@@ -37,7 +37,6 @@
 #include "h263data.h"
 #include "mathops.h"
 #include "mpegutils.h"
-#include "unary.h"
 #include "flv.h"
 #include "mpeg4video.h"
 #include "internal.h"
diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c
index 3064c6f..5c816f4 100644
--- a/libavcodec/on2avc.c
+++ b/libavcodec/on2avc.c
@@ -29,7 +29,6 @@
 #include "get_bits.h"
 #include "golomb.h"
 #include "internal.h"
-#include "unary.h"
 
 #include "on2avcdata.h"
 


======================================================================




More information about the ffmpeg-cvslog mailing list