diff options
| author | Jindřich Makovička <makovick@gmail.com> | 2005-12-18 13:29:09 +0000 |
|---|---|---|
| committer | Jindřich Makovička <makovick@gmail.com> | 2005-12-18 13:29:09 +0000 |
| commit | 9944fb97c46301fca21c9ff18ab906a29489bcc4 (patch) | |
| tree | 3f1569ffeaef4bfd1844ff1bc19fd1812edfae81 | |
| parent | 5639729bed02cbf7c8ac653da3120e825b95a87b (diff) | |
| download | ffmpeg-9944fb97c46301fca21c9ff18ab906a29489bcc4.tar.gz | |
new qscale type to distinguish H264
Originally committed as revision 4753 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavcodec/h264.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 6a797f925c..ec694522c5 100644 --- 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 19c2fea9e4..e942d16950 100644 --- 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; |