[FFmpeg-cvslog] r23940 - in trunk: ffmpeg.c ffplay.c libavcodec/avcodec.h libavcodec/colorspace.h libavcodec/dvbsub.c libavcodec/dvbsubdec.c libavcodec/dvdsubdec.c libavcodec/imgconvert.c libavcodec/pgssubdec.c li...
stefano
subversion
Thu Jul 1 20:49:44 CEST 2010
Author: stefano
Date: Thu Jul 1 20:49:44 2010
New Revision: 23940
Log:
Move colorspace.h from libavcodec to libavutil.
Avoid a compile-time dependency of the pad filter on libavcodec.
Added:
trunk/libavutil/colorspace.h
- copied, changed from r23939, trunk/libavcodec/colorspace.h
Deleted:
trunk/libavcodec/colorspace.h
Modified:
trunk/ffmpeg.c
trunk/ffplay.c
trunk/libavcodec/avcodec.h
trunk/libavcodec/dvbsub.c
trunk/libavcodec/dvbsubdec.c
trunk/libavcodec/dvdsubdec.c
trunk/libavcodec/imgconvert.c
trunk/libavcodec/pgssubdec.c
trunk/libavfilter/vf_pad.c
trunk/libavutil/avutil.h
Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c Thu Jul 1 19:10:31 2010 (r23939)
+++ trunk/ffmpeg.c Thu Jul 1 20:49:44 2010 (r23940)
@@ -36,7 +36,7 @@
#include "libswscale/swscale.h"
#include "libavcodec/opt.h"
#include "libavcodec/audioconvert.h"
-#include "libavcodec/colorspace.h"
+#include "libavutil/colorspace.h"
#include "libavutil/fifo.h"
#include "libavutil/pixdesc.h"
#include "libavutil/avstring.h"
Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c Thu Jul 1 19:10:31 2010 (r23939)
+++ trunk/ffplay.c Thu Jul 1 20:49:44 2010 (r23940)
@@ -24,12 +24,12 @@
#include <math.h>
#include <limits.h>
#include "libavutil/avstring.h"
+#include "libavutil/colorspace.h"
#include "libavutil/pixdesc.h"
#include "libavformat/avformat.h"
#include "libavdevice/avdevice.h"
#include "libswscale/swscale.h"
#include "libavcodec/audioconvert.h"
-#include "libavcodec/colorspace.h"
#include "libavcodec/opt.h"
#include "libavcodec/avfft.h"
Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h Thu Jul 1 19:10:31 2010 (r23939)
+++ trunk/libavcodec/avcodec.h Thu Jul 1 20:49:44 2010 (r23940)
@@ -31,7 +31,7 @@
#define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 78
-#define LIBAVCODEC_VERSION_MICRO 0
+#define LIBAVCODEC_VERSION_MICRO 1
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
Modified: trunk/libavcodec/dvbsub.c
==============================================================================
--- trunk/libavcodec/dvbsub.c Thu Jul 1 19:10:31 2010 (r23939)
+++ trunk/libavcodec/dvbsub.c Thu Jul 1 20:49:44 2010 (r23940)
@@ -20,7 +20,7 @@
*/
#include "avcodec.h"
#include "bytestream.h"
-#include "colorspace.h"
+#include "libavutil/colorspace.h"
typedef struct DVBSubtitleContext {
int hide_state;
Modified: trunk/libavcodec/dvbsubdec.c
==============================================================================
--- trunk/libavcodec/dvbsubdec.c Thu Jul 1 19:10:31 2010 (r23939)
+++ trunk/libavcodec/dvbsubdec.c Thu Jul 1 20:49:44 2010 (r23940)
@@ -21,8 +21,8 @@
#include "avcodec.h"
#include "dsputil.h"
#include "get_bits.h"
-#include "colorspace.h"
#include "bytestream.h"
+#include "libavutil/colorspace.h"
//#define DEBUG
//#define DEBUG_PACKET_CONTENTS
Modified: trunk/libavcodec/dvdsubdec.c
==============================================================================
--- trunk/libavcodec/dvdsubdec.c Thu Jul 1 19:10:31 2010 (r23939)
+++ trunk/libavcodec/dvdsubdec.c Thu Jul 1 20:49:44 2010 (r23940)
@@ -20,8 +20,8 @@
*/
#include "avcodec.h"
#include "get_bits.h"
-#include "colorspace.h"
#include "dsputil.h"
+#include "libavutil/colorspace.h"
//#define DEBUG
Modified: trunk/libavcodec/imgconvert.c
==============================================================================
--- trunk/libavcodec/imgconvert.c Thu Jul 1 19:10:31 2010 (r23939)
+++ trunk/libavcodec/imgconvert.c Thu Jul 1 20:49:44 2010 (r23940)
@@ -32,9 +32,9 @@
#include "avcodec.h"
#include "dsputil.h"
-#include "colorspace.h"
#include "internal.h"
#include "imgconvert.h"
+#include "libavutil/colorspace.h"
#include "libavutil/pixdesc.h"
#if HAVE_MMX
Modified: trunk/libavcodec/pgssubdec.c
==============================================================================
--- trunk/libavcodec/pgssubdec.c Thu Jul 1 19:10:31 2010 (r23939)
+++ trunk/libavcodec/pgssubdec.c Thu Jul 1 20:49:44 2010 (r23940)
@@ -26,8 +26,8 @@
#include "avcodec.h"
#include "dsputil.h"
-#include "colorspace.h"
#include "bytestream.h"
+#include "libavutil/colorspace.h"
//#define DEBUG_PACKET_CONTENTS
Modified: trunk/libavfilter/vf_pad.c
==============================================================================
--- trunk/libavfilter/vf_pad.c Thu Jul 1 19:10:31 2010 (r23939)
+++ trunk/libavfilter/vf_pad.c Thu Jul 1 20:49:44 2010 (r23940)
@@ -27,7 +27,7 @@
#include "avfilter.h"
#include "parseutils.h"
#include "libavutil/pixdesc.h"
-#include "libavcodec/colorspace.h"
+#include "libavutil/colorspace.h"
typedef struct {
int w, h; ///< output dimensions, a value of 0 will result in the input size
Modified: trunk/libavutil/avutil.h
==============================================================================
--- trunk/libavutil/avutil.h Thu Jul 1 19:10:31 2010 (r23939)
+++ trunk/libavutil/avutil.h Thu Jul 1 20:49:44 2010 (r23940)
@@ -41,7 +41,7 @@
#define LIBAVUTIL_VERSION_MAJOR 50
#define LIBAVUTIL_VERSION_MINOR 19
-#define LIBAVUTIL_VERSION_MICRO 0
+#define LIBAVUTIL_VERSION_MICRO 1
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
Copied and modified: trunk/libavutil/colorspace.h (from r23939, trunk/libavcodec/colorspace.h)
==============================================================================
--- trunk/libavcodec/colorspace.h Thu Jul 1 19:10:31 2010 (r23939, copy source)
+++ trunk/libavutil/colorspace.h Thu Jul 1 20:49:44 2010 (r23940)
@@ -24,8 +24,8 @@
* Various defines for YUV<->RGB conversion
*/
-#ifndef AVCODEC_COLORSPACE_H
-#define AVCODEC_COLORSPACE_H
+#ifndef AVUTIL_COLORSPACE_H
+#define AVUTIL_COLORSPACE_H
#define SCALEBITS 10
#define ONE_HALF (1 << (SCALEBITS - 1))
@@ -108,4 +108,4 @@ static inline int C_JPEG_TO_CCIR(int y)
(((FIX(0.50000*224.0/255.0) * r1 - FIX(0.41869*224.0/255.0) * g1 - \
FIX(0.08131*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128)
-#endif /* AVCODEC_COLORSPACE_H */
+#endif /* AVUTIL_COLORSPACE_H */
More information about the ffmpeg-cvslog
mailing list