[SCM] libav/experimental: Move pixdesc.{h, c} from libavcodec to libavutil.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:53:41 UTC 2013


The following commit has been merged in the experimental branch:
commit 51135d1d8e113aef5dbafd578460daeb92972c7f
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Tue Oct 27 20:56:56 2009 +0000

    Move pixdesc.{h,c} from libavcodec to libavutil.
    
    This way pixdescs can be used without requiring a dependency on
    libavcodec.
    
    Originally committed as revision 20389 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/pixdesc.c b/libavutil/pixdesc.c
similarity index 99%
rename from libavcodec/pixdesc.c
rename to libavutil/pixdesc.c
index d9f2eaa..7e8cea7 100644
--- a/libavcodec/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/pixfmt.h"
+#include "pixfmt.h"
 #include "pixdesc.h"
 
 const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
diff --git a/libavcodec/pixdesc.h b/libavutil/pixdesc.h
similarity index 98%
rename from libavcodec/pixdesc.h
rename to libavutil/pixdesc.h
index d5f2be5..fd1428f 100644
--- a/libavcodec/pixdesc.h
+++ b/libavutil/pixdesc.h
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_PIXDESC_H
-#define AVCODEC_PIXDESC_H
+#ifndef AVUTIL_PIXDESC_H
+#define AVUTIL_PIXDESC_H
 
 #include <inttypes.h>
 
-#include "libavutil/intreadwrite.h"
+#include "intreadwrite.h"
 
 typedef struct AVComponentDescriptor{
     uint16_t plane        :2;            ///< which of the 4 planes contains the component
@@ -204,4 +204,4 @@ static inline void write_line(const uint16_t *src, uint8_t *data[4], const int l
  */
 int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
 
-#endif /* AVCODEC_PIXDESC_H */
+#endif /* AVUTIL_PIXDESC_H */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list