virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

avcodec/mjpegenc: Revert some differences in ff_mjpeg_encode_mb() relative to pre optimal huffman

Browse Source 
The changes are not needed anymore and the return code was never used

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-02-09 23:07:11 +01:00
parent b39129b68e
commit f57665b318
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/mjpegenc.c
View File

@ -267,10 +267,9 @@ static void encode_block(MpegEncContext *s, int16_t *block, int n)
ff_mjpeg_encode_code(m, table_id, 0); ff_mjpeg_encode_code(m, table_id, 0);
} }
int ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[12][64]) void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[12][64])
{ {
int i, is_chroma_420; int i;
if (s->chroma_format == CHROMA_444) { if (s->chroma_format == CHROMA_444) {
encode_block(s, block[0], 0); encode_block(s, block[0], 0);
encode_block(s, block[2], 2); encode_block(s, block[2], 2);
@ -288,11 +287,10 @@ int ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[12][64])
encode_block(s, block[11], 11); encode_block(s, block[11], 11);
} }
} else { } else {
is_chroma_420 = (s->chroma_format == CHROMA_420);
for(i=0;i<5;i++) { for(i=0;i<5;i++) {
encode_block(s, block[i], i); encode_block(s, block[i], i);
} }
if (is_chroma_420) { if (s->chroma_format == CHROMA_420) {
encode_block(s, block[5], 5); encode_block(s, block[5], 5);
} else { } else {
encode_block(s, block[6], 6); encode_block(s, block[6], 6);
@ -300,8 +298,6 @@ int ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[12][64])
encode_block(s, block[7], 7); encode_block(s, block[7], 7);
} }
} }
return 0;
} }
// maximum over s->mjpeg_vsample[i] // maximum over s->mjpeg_vsample[i]

2
libavcodec/mjpegenc.h
View File

@ -107,6 +107,6 @@ static inline void put_marker(PutBitContext *p, enum JpegMarker code)
int ff_mjpeg_encode_init(MpegEncContext *s); int ff_mjpeg_encode_init(MpegEncContext *s);
void ff_mjpeg_encode_picture_frame(MpegEncContext *s); void ff_mjpeg_encode_picture_frame(MpegEncContext *s);
void ff_mjpeg_encode_close(MpegEncContext *s); void ff_mjpeg_encode_close(MpegEncContext *s);
int ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[12][64]); void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[12][64]);
#endif /* AVCODEC_MJPEGENC_H */ #endif /* AVCODEC_MJPEGENC_H */