diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-01-18 22:07:39 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-01-18 22:07:39 +0000 |
| commit | 50a5368b8765271ce273b9950ec4b85118ecb5a3 (patch) | |
| tree | 59d3ebc88c4bb198fa2a97b4b462c990a1f5c596 /src/combined/ffmpeg/ffmpeg_decoder.h | |
| parent | 3119dd2de36dbd8bb9af95ab1826c15f3099b597 (diff) | |
| parent | a5d426c371ba02f6065a19dd9707cf248df245d5 (diff) | |
| download | xine-lib-50a5368b8765271ce273b9950ec4b85118ecb5a3.tar.gz xine-lib-50a5368b8765271ce273b9950ec4b85118ecb5a3.tar.bz2 | |
Merge from 1.1.
--HG--
rename : include/xine.h.in => include/xine.h
rename : src/xine-engine/xine_internal.h => include/xine/xine_internal.h
rename : src/combined/ffmpeg/ffmpeg_encoder.c => src/dxr3/ffmpeg_encoder.c
Diffstat (limited to 'src/combined/ffmpeg/ffmpeg_decoder.h')
| -rw-r--r-- | src/combined/ffmpeg/ffmpeg_decoder.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/combined/ffmpeg/ffmpeg_decoder.h b/src/combined/ffmpeg/ffmpeg_decoder.h index f679a5ce9..4d9943384 100644 --- a/src/combined/ffmpeg/ffmpeg_decoder.h +++ b/src/combined/ffmpeg/ffmpeg_decoder.h @@ -31,10 +31,6 @@ # include <libavcodec/avcodec.h> #endif -#if LIBAVCODEC_VERSION_MAJOR > 51 -#define bits_per_sample bits_per_coded_sample -#endif - typedef struct ff_codec_s { uint32_t type; enum CodecID id; |