diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-11-12 12:58:21 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-11-13 11:21:46 +0100 |
| commit | fe55c3197698e60753ed4ba78a588481bb975e20 (patch) | |
| tree | 443d102fa8fee09a881b2fa12fa96b96b48aa337 /libavcodec/msvideo1enc.c | |
| parent | 255302da7019753bae84d809c6d603c4cd0a41ca (diff) | |
| download | ffmpeg-fe55c3197698e60753ed4ba78a588481bb975e20.tar.gz | |
lavc/elbg: rename ff_ symbols to avpriv_, so they can be used in shared libs
In particular, allows the use of elbg in other FFmpeg libraries, required
by the pending elbg filter.
Diffstat (limited to 'libavcodec/msvideo1enc.c')
| -rw-r--r-- | libavcodec/msvideo1enc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/msvideo1enc.c b/libavcodec/msvideo1enc.c index 1da302a019..7844d57b70 100644 --- a/libavcodec/msvideo1enc.c +++ b/libavcodec/msvideo1enc.c @@ -118,8 +118,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, } // try to find optimal value to fill whole 4x4 block score = 0; - ff_init_elbg(c->block, 3, 16, c->avg, 1, 1, c->output, &c->rnd); - ff_do_elbg (c->block, 3, 16, c->avg, 1, 1, c->output, &c->rnd); + avpriv_init_elbg(c->block, 3, 16, c->avg, 1, 1, c->output, &c->rnd); + avpriv_do_elbg (c->block, 3, 16, c->avg, 1, 1, c->output, &c->rnd); if(c->avg[0] == 1) // red component = 1 will be written as skip code c->avg[0] = 0; for(j = 0; j < 4; j++){ @@ -138,8 +138,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, } // search for optimal filling of 2-color block score = 0; - ff_init_elbg(c->block, 3, 16, c->codebook, 2, 1, c->output, &c->rnd); - ff_do_elbg (c->block, 3, 16, c->codebook, 2, 1, c->output, &c->rnd); + avpriv_init_elbg(c->block, 3, 16, c->codebook, 2, 1, c->output, &c->rnd); + avpriv_do_elbg (c->block, 3, 16, c->codebook, 2, 1, c->output, &c->rnd); // last output value should be always 1, swap codebooks if needed if(!c->output[15]){ for(i = 0; i < 3; i++) @@ -164,8 +164,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, // search for optimal filling of 2-color 2x2 subblocks score = 0; for(i = 0; i < 4; i++){ - ff_init_elbg(c->block2 + i*4*3, 3, 4, c->codebook2 + i*2*3, 2, 1, c->output2 + i*4, &c->rnd); - ff_do_elbg (c->block2 + i*4*3, 3, 4, c->codebook2 + i*2*3, 2, 1, c->output2 + i*4, &c->rnd); + avpriv_init_elbg(c->block2 + i*4*3, 3, 4, c->codebook2 + i*2*3, 2, 1, c->output2 + i*4, &c->rnd); + avpriv_do_elbg (c->block2 + i*4*3, 3, 4, c->codebook2 + i*2*3, 2, 1, c->output2 + i*4, &c->rnd); } // last value should be always 1, swap codebooks if needed if(!c->output2[15]){ |