mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-06 16:10:09 +02:00
Don't test for H264 encoding unless an encoder exists.
Originally committed as revision 14048 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
5faf3a4449
commit
fedec603db
@ -2726,9 +2726,9 @@ static void hl_decode_mb(H264Context *h){
|
||||
MpegEncContext * const s = &h->s;
|
||||
const int mb_xy= h->mb_xy;
|
||||
const int mb_type= s->current_picture.mb_type[mb_xy];
|
||||
int is_complex = FRAME_MBAFF || MB_FIELD || IS_INTRA_PCM(mb_type) || s->codec_id != CODEC_ID_H264 || (ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || s->encoding;
|
||||
int is_complex = FRAME_MBAFF || MB_FIELD || IS_INTRA_PCM(mb_type) || s->codec_id != CODEC_ID_H264 || (ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (ENABLE_H264_ENCODER && s->encoding);
|
||||
|
||||
if(!s->decode)
|
||||
if(ENABLE_H264_ENCODER && !s->decode)
|
||||
return;
|
||||
|
||||
if (is_complex)
|
||||
|
@ -70,6 +70,10 @@
|
||||
#endif
|
||||
#define FIELD_OR_MBAFF_PICTURE (FRAME_MBAFF || FIELD_PICTURE)
|
||||
|
||||
#ifndef ENABLE_H264_ENCODER
|
||||
#define ENABLE_H264_ENCODER 0
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Sequence parameter set
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user