VP8: faster MV clipping

[ffmpeg] / libavcodec / ljpegenc.c

diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c
index 6c9f058dce01f2d1216e0fc90f4be5ab997c51a2..56336cb3bfab52bca93960325bc483ed5d9c474d 100644 (file)
--- a/libavcodec/ljpegenc.c
+++ b/libavcodec/ljpegenc.c
@@ -26,7 +26,7 @@
  */
 
 /**
- * @file libavcodec/ljpegenc.c
+ * @file
  * lossless JPEG encoder.
  */
 
@@ -56,7 +56,7 @@ static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, in
 
     s->header_bits= put_bits_count(&s->pb);
 
-    if(avctx->pix_fmt == PIX_FMT_RGB32){
+    if(avctx->pix_fmt == PIX_FMT_BGRA){
         int x, y, i;
         const int linesize= p->linesize[0];
         uint16_t (*buffer)[4]= (void *) s->rd_scratchpad;
@@ -186,9 +186,9 @@ static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, in
 }
 
 
-AVCodec ljpeg_encoder = { //FIXME avoid MPV_* lossless JPEG should not need them
+AVCodec ff_ljpeg_encoder = { //FIXME avoid MPV_* lossless JPEG should not need them
     "ljpeg",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_LJPEG,
     sizeof(MpegEncContext),
     MPV_encode_init,