diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-16 00:49:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-16 01:34:37 +0100 |
| commit | 6cb2085278bdd3ee83d5ed528d98c78756ee7277 (patch) | |
| tree | da57b6491e07c2deb9cf57e3cd595323d118c244 /libavcodec/rtjpeg.c | |
| parent | 8812c97b98321f82763b7c9c1363c7c1f6cace8f (diff) | |
| parent | 210f72845c11fbab7b913a4f18ffd67e99d2dd4f (diff) | |
| download | ffmpeg-6cb2085278bdd3ee83d5ed528d98c78756ee7277.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (27 commits)
ppc: Add ff_ prefix to nonstatic symbols
sh4: Add ff_ prefix to nonstatic symbols
mpegvideo: Add ff_ prefix to nonstatic functions
rtjpeg: Add ff_ prefix to nonstatic symbols
rv: Add ff_ prefix to nonstatic symbols
vp56: Add ff_ prefix to nonstatic symbols
vorbis: Add ff_ prefix to nonstatic symbols
msmpeg4: Add ff_ prefix to nonstatic symbols
vc1: Add ff_ prefix to nonstatic symbols
msmpeg4: Add ff_ prefixes to nonstatic symbols
snow: Add ff_ prefix to nonstatic symbols
mpeg12: Add ff_ prefix to nonstatic symbols
mpeg4: Add ff_ prefixes to nonstatic symbols
lagarith: Add ff_ prefix to lag_rac_init
libavcodec: Add ff_ prefix to j_rev_dct*
dsputil: Add ff_ prefix to inv_zigzag_direct16
libavcodec: Prefix fdct_ifast, fdct_ifast248
dsputil: Add ff_ prefix to the dsputil*_init* functions
libavcodec: Add ff_ prefix to some nonstatic symbols
vlc/rl: Add ff_ prefix to the nonstatic symbols
...
Conflicts:
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/dnxhddec.c
libavcodec/ffv1.c
libavcodec/h263.h
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/nuv.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/proresdsp.c
libavcodec/svq3.c
libavcodec/version.h
libavformat/dv.h
libavformat/dvenc.c
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rtjpeg.c')
| -rw-r--r-- | libavcodec/rtjpeg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/rtjpeg.c b/libavcodec/rtjpeg.c index e03282b412..7797a655c1 100644 --- a/libavcodec/rtjpeg.c +++ b/libavcodec/rtjpeg.c @@ -97,15 +97,15 @@ static inline int get_block(GetBitContext *gb, DCTELEM *block, const uint8_t *sc /** * @brief decode one rtjpeg YUV420 frame - * @param c context, must be initialized via rtjpeg_decode_init + * @param c context, must be initialized via ff_rtjpeg_decode_init * @param f AVFrame to place decoded frame into. If parts of the frame * are not coded they are left unchanged, so consider initializing it * @param buf buffer containing input data * @param buf_size length of input data in bytes * @return number of bytes consumed from the input buffer */ -int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f, - const uint8_t *buf, int buf_size) { +int ff_rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f, + const uint8_t *buf, int buf_size) { GetBitContext gb; int w = c->w / 16, h = c->h / 16; int x, y; @@ -154,9 +154,9 @@ int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f, * @param lquant luma quantization table to use * @param cquant chroma quantization table to use */ -void rtjpeg_decode_init(RTJpegContext *c, DSPContext *dsp, - int width, int height, - const uint32_t *lquant, const uint32_t *cquant) { +void ff_rtjpeg_decode_init(RTJpegContext *c, DSPContext *dsp, + int width, int height, + const uint32_t *lquant, const uint32_t *cquant) { int i; c->dsp = dsp; for (i = 0; i < 64; i++) { |