aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2009-10-27 20:56:56 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2009-10-27 20:56:56 +0000
commit51135d1d8e113aef5dbafd578460daeb92972c7f (patch)
treedce6c8209f8ddeeb587cd81d008b2b077f232839
parent04a5c106f902ee04a02109e1e7f6b1fa7794eb4e (diff)
downloadffmpeg-51135d1d8e113aef5dbafd578460daeb92972c7f.tar.gz
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
-rw-r--r--libavutil/pixdesc.c (renamed from libavcodec/pixdesc.c)2
-rw-r--r--libavutil/pixdesc.h (renamed from libavcodec/pixdesc.h)8
2 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/pixdesc.c b/libavutil/pixdesc.c
index d9f2eaac80..7e8cea76c6 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
index d5f2be58c2..fd1428fd81 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 */