Merge commit '72c0b8f724a71d2784aecad0e5221e7ab6206371'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 12:37:04 +0000 (13:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 12:37:09 +0000 (13:37 +0100)
* commit '72c0b8f724a71d2784aecad0e5221e7ab6206371':
  ljpeg: remove a commented-out line

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ljpegenc.c

index c5d9991..514d493 100644 (file)
@@ -225,7 +225,6 @@ static int encode_picture_lossless(AVCodecContext *avctx, AVPacket *pkt,
     *got_packet = 1;
 
     return 0;
-//    return (put_bits_count(&f->pb)+7)/8;
 }
 
 static av_cold int ljpeg_encode_close(AVCodecContext *avctx)