diff options
| author | Torsten Jager <t.jager@gmx.de> | 2014-02-15 13:35:25 +0100 |
|---|---|---|
| committer | Torsten Jager <t.jager@gmx.de> | 2014-02-15 13:35:25 +0100 |
| commit | 923012eedfee53ec6e2ae9f8dabb71f644f8b858 (patch) | |
| tree | ce6110a330a91dd0468ec2ce17b92120556348e4 /src | |
| parent | f56650d12bcdc5f1052143d872add024b6982b90 (diff) | |
| download | xine-lib-923012eedfee53ec6e2ae9f8dabb71f644f8b858.tar.gz xine-lib-923012eedfee53ec6e2ae9f8dabb71f644f8b858.tar.bz2 | |
Detach dv audio decoder from avcodec.h.
That ff takeout was made many years ago, and no longer fits
newer external header. Big thanks to Mounir Ouali <oualim@web.de>
for pointing that out.
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_dec/ff_dvdata.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/audio_dec/ff_dvdata.h b/src/audio_dec/ff_dvdata.h index f1d7af260..458ab3e8a 100644 --- a/src/audio_dec/ff_dvdata.h +++ b/src/audio_dec/ff_dvdata.h @@ -28,13 +28,19 @@ #define FFMPEG_DVDATA_H #ifdef HAVE_FFMPEG_AVUTIL_H -# include <avcodec.h> # include <rational.h> #else -# include <libavcodec/avcodec.h> # include <libavutil/rational.h> #endif +/* TJ. This is a fairly old snapshot. Dont mess it up by including + a recent avcodec.h, and put a little outtake from it here. */ +enum PixelFormat { + PIX_FMT_YUV420P = 0, + PIX_FMT_YUV422P = 4, + PIX_FMT_YUV411P = 7 +}; + /* * DVprofile is used to express the differences between various * DV flavors. For now it's primarily used for differentiating @@ -2686,6 +2692,7 @@ static inline const DVprofile* dv_frame_profile(uint8_t* frame) } } +#if 0 /* not used in xine DV audio */ static inline const DVprofile* dv_codec_profile(AVCodecContext* codec) { int i; @@ -2699,6 +2706,7 @@ static inline const DVprofile* dv_codec_profile(AVCodecContext* codec) return NULL; } +#endif static inline int dv_write_dif_id(enum dv_section_type t, uint8_t chan_num, uint8_t seq_num, uint8_t dif_num, uint8_t* buf) @@ -2735,3 +2743,5 @@ static inline int dv_write_ssyb_id(uint8_t syb_num, uint8_t fr, uint8_t* buf) } #endif /* FFMPEG_DVDATA_H */ + + |