new qscale type to distinguish H264

Originally committed as revision 4753 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 6a797f925ccaeb7b3716ddc3499391d058ecee06..ec694522c516c0ea49c34e63bc2ec38b69d6c82e 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -648,6 +648,7 @@ typedef struct AVPanScan{
 
 #define FF_QSCALE_TYPE_MPEG1   0
 #define FF_QSCALE_TYPE_MPEG2   1
+#define FF_QSCALE_TYPE_H264    2
 
 #define FF_BUFFER_TYPE_INTERNAL 1
 #define FF_BUFFER_TYPE_USER     2 ///< Direct rendering buffers (image is (de)allocated by user)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 19c2fea9e496cccf908f9e6b7b33290c39a2367a..e942d169506309a9f145b3ea4fd66e88e86eafad 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -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
 
+    s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264;
     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;