Merge commit '72c0b8f724a71d2784aecad0e5221e7ab6206371'

* commit '72c0b8f724a71d2784aecad0e5221e7ab6206371':
  ljpeg: remove a commented-out line

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-06 13:37:04 +01:00
commit 6deaab360c

View 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)