Commit 51135d1d authored by Stefano Sabatini's avatar Stefano Sabatini

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
parent 04a5c106
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/pixfmt.h" #include "pixfmt.h"
#include "pixdesc.h" #include "pixdesc.h"
const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
......
...@@ -19,12 +19,12 @@ ...@@ -19,12 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef AVCODEC_PIXDESC_H #ifndef AVUTIL_PIXDESC_H
#define AVCODEC_PIXDESC_H #define AVUTIL_PIXDESC_H
#include <inttypes.h> #include <inttypes.h>
#include "libavutil/intreadwrite.h" #include "intreadwrite.h"
typedef struct AVComponentDescriptor{ typedef struct AVComponentDescriptor{
uint16_t plane :2; ///< which of the 4 planes contains the component 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 ...@@ -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); int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
#endif /* AVCODEC_PIXDESC_H */ #endif /* AVUTIL_PIXDESC_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment