diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-17 01:36:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-17 02:18:16 +0100 |
| commit | 552ec4c9fda480d61bff8447347b08f927f1fca3 (patch) | |
| tree | 72da1c610adde49ba4bb08e310e7d8f6b18ec581 /libavcodec/proresdec_lgpl.c | |
| parent | 6d8e6fe9dbc365f50521cf0c4a5ffee97c970cb5 (diff) | |
| parent | a1e98f198e9db4e5ddfc2f777014179d3d7bc4d2 (diff) | |
| download | ffmpeg-552ec4c9fda480d61bff8447347b08f927f1fca3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
get_bits: remove A32 variant
avconv: support stream specifiers in -metadata and -map_metadata
wavpack: Fix 32-bit clipping
wavpack: Clip samples after shifting
h264: don't drop B-frames after next keyframe on POC reset.
get_bits: remove useless pointer casts
configure: refactor lists of tests and components into variables
rv40: NEON optimised weak loop filter
mpegts: replace some magic numbers with the existing define
swscale: add unscaled packed 16 bit per component endianess conversion
Conflicts:
libavcodec/get_bits.h
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresdec_lgpl.c')
| -rw-r--r-- | libavcodec/proresdec_lgpl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/proresdec_lgpl.c b/libavcodec/proresdec_lgpl.c index 1e9b962790..5fe47755c2 100644 --- a/libavcodec/proresdec_lgpl.c +++ b/libavcodec/proresdec_lgpl.c @@ -28,7 +28,7 @@ * @see http://wiki.multimedia.cx/index.php?title=Apple_ProRes */ -#define A32_BITSTREAM_READER // some ProRes vlc codes require up to 28 bits to be read at once +#define LONG_BITSTREAM_READER // some ProRes vlc codes require up to 28 bits to be read at once #include <stdint.h> |