diff options
Diffstat (limited to 'src/libffmpeg/libavcodec/cljr.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/cljr.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/libffmpeg/libavcodec/cljr.c b/src/libffmpeg/libavcodec/cljr.c index 8072eee18..feb0d8bb2 100644 --- a/src/libffmpeg/libavcodec/cljr.c +++ b/src/libffmpeg/libavcodec/cljr.c @@ -14,15 +14,15 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ - + /** * @file cljr.c * Cirrus Logic AccuPak codec. */ - + #include "avcodec.h" #include "mpegvideo.h" @@ -34,7 +34,7 @@ typedef struct CLJRContext{ GetBitContext gb; } CLJRContext; -static int decode_frame(AVCodecContext *avctx, +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size) { @@ -61,13 +61,13 @@ static int decode_frame(AVCodecContext *avctx, uint8_t *cb= &a->picture.data[1][ y*a->picture.linesize[1] ]; uint8_t *cr= &a->picture.data[2][ y*a->picture.linesize[2] ]; for(x=0; x<avctx->width; x+=4){ - luma[3] = get_bits(&a->gb, 5) << 3; - luma[2] = get_bits(&a->gb, 5) << 3; - luma[1] = get_bits(&a->gb, 5) << 3; - luma[0] = get_bits(&a->gb, 5) << 3; - luma+= 4; - *(cb++) = get_bits(&a->gb, 6) << 2; - *(cr++) = get_bits(&a->gb, 6) << 2; + luma[3] = get_bits(&a->gb, 5) << 3; + luma[2] = get_bits(&a->gb, 5) << 3; + luma[1] = get_bits(&a->gb, 5) << 3; + luma[0] = get_bits(&a->gb, 5) << 3; + luma+= 4; + *(cb++) = get_bits(&a->gb, 6) << 2; + *(cr++) = get_bits(&a->gb, 6) << 2; } } @@ -75,7 +75,7 @@ static int decode_frame(AVCodecContext *avctx, *data_size = sizeof(AVPicture); emms_c(); - + return buf_size; } @@ -92,13 +92,13 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, p->key_frame= 1; emms_c(); - + align_put_bits(&a->pb); while(get_bit_count(&a->pb)&31) put_bits(&a->pb, 8, 0); - + size= get_bit_count(&a->pb)/32; - + return size*4; } #endif @@ -113,7 +113,7 @@ static void common_init(AVCodecContext *avctx){ static int decode_init(AVCodecContext *avctx){ common_init(avctx); - + avctx->pix_fmt= PIX_FMT_YUV411P; return 0; @@ -123,7 +123,7 @@ static int decode_init(AVCodecContext *avctx){ static int encode_init(AVCodecContext *avctx){ common_init(avctx); - + return 0; } #endif |