new qscale type to distinguish H264

Originally committed as revision 4753 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Jindřich Makovička 19 years ago
parent 5639729bed
commit 9944fb97c4
  1. 1
      libavcodec/avcodec.h
  2. 1
      libavcodec/h264.c

@ -648,6 +648,7 @@ typedef struct AVPanScan{
#define FF_QSCALE_TYPE_MPEG1 0 #define FF_QSCALE_TYPE_MPEG1 0
#define FF_QSCALE_TYPE_MPEG2 1 #define FF_QSCALE_TYPE_MPEG2 1
#define FF_QSCALE_TYPE_H264 2
#define FF_BUFFER_TYPE_INTERNAL 1 #define FF_BUFFER_TYPE_INTERNAL 1
#define FF_BUFFER_TYPE_USER 2 ///< Direct rendering buffers (image is (de)allocated by user) #define FF_BUFFER_TYPE_USER 2 ///< Direct rendering buffers (image is (de)allocated by user)

@ -7552,6 +7552,7 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
if(!s->current_picture_ptr) return buf_index; //no frame if(!s->current_picture_ptr) return buf_index; //no frame
s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264;
s->current_picture_ptr->pict_type= s->pict_type; s->current_picture_ptr->pict_type= s->pict_type;
s->current_picture_ptr->key_frame= s->pict_type == I_TYPE && h->nal_unit_type == NAL_IDR_SLICE; s->current_picture_ptr->key_frame= s->pict_type == I_TYPE && h->nal_unit_type == NAL_IDR_SLICE;

Loading…
Cancel
Save