diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-10 14:05:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-10 14:06:20 +0200 |
| commit | bff2afb3e978c9cdffdd03a2571e4f6ddab74731 (patch) | |
| tree | 7a92225c964848221a8be28232d1f6137475eb66 /libavcodec/mjpeg.h | |
| parent | e4fe4d01fc31bfdabf6f9b106c633139287a400d (diff) | |
| parent | a84edbacaf5adbe6e3672851aa8b3034b95787e2 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Only compile motion_est code when encoders are enabled
mem: fix typo in check for __ICC
fate: mp3: drop redundant CMP setting
rtp: Depacketization of JPEG (RFC 2435)
Rename ff_put_string to avpriv_put_string
mjpeg: Rename some symbols to avpriv_* instead of ff_*
yadif: cosmetics
Conflicts:
Changelog
libavcodec/mjpegenc.c
libavcodec/x86/Makefile
libavfilter/vf_yadif.c
libavformat/version.h
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg.h')
| -rw-r--r-- | libavcodec/mjpeg.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h index ba1173380c..d826278216 100644 --- a/libavcodec/mjpeg.h +++ b/libavcodec/mjpeg.h @@ -138,16 +138,16 @@ static inline void put_marker(PutBitContext *p, int code) case 7: ret= (left + top)>>1; break;\ } -extern const uint8_t ff_mjpeg_bits_dc_luminance[]; -extern const uint8_t ff_mjpeg_val_dc[]; +extern const uint8_t avpriv_mjpeg_bits_dc_luminance[]; +extern const uint8_t avpriv_mjpeg_val_dc[]; -extern const uint8_t ff_mjpeg_bits_dc_chrominance[]; +extern const uint8_t avpriv_mjpeg_bits_dc_chrominance[]; -extern const uint8_t ff_mjpeg_bits_ac_luminance[]; -extern const uint8_t ff_mjpeg_val_ac_luminance[]; +extern const uint8_t avpriv_mjpeg_bits_ac_luminance[]; +extern const uint8_t avpriv_mjpeg_val_ac_luminance[]; -extern const uint8_t ff_mjpeg_bits_ac_chrominance[]; -extern const uint8_t ff_mjpeg_val_ac_chrominance[]; +extern const uint8_t avpriv_mjpeg_bits_ac_chrominance[]; +extern const uint8_t avpriv_mjpeg_val_ac_chrominance[]; void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code, const uint8_t *bits_table, |