Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 10:40:30 +0000 (11:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 10:40:30 +0000 (11:40 +0100)
* commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d':
  mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc()

Conflicts:
libavcodec/mjpegenc.h

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

Simple merge
Simple merge
@@@ -55,8 -55,8 +55,8 @@@ void ff_mjpeg_encode_picture_header(AVC
                                      ScanTable *intra_scantable,
                                      uint16_t intra_matrix[64]);
  void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits);
 -void ff_mjpeg_encode_stuffing(PutBitContext *pbc);
 +void ff_mjpeg_encode_stuffing(MpegEncContext *s);
- void ff_mjpeg_encode_dc(MpegEncContext *s, int val,
+ void ff_mjpeg_encode_dc(PutBitContext *pb, int val,
                          uint8_t *huff_size, uint16_t *huff_code);
  void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[6][64]);