[SCM] libav/experimental: Replace hard-coded SEI type constants with symbolic names

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:37:13 UTC 2013


The following commit has been merged in the experimental branch:
commit dd02ea118bf89f94090902e3ef2287abdaf3e3b1
Author: Ivan Schreter <schreter at gmx.net>
Date:   Sun Feb 8 20:28:12 2009 +0000

    Replace hard-coded SEI type constants with symbolic names
    
    Patch by Ivan Schreter ( schreter gmx net )
    
    Originally committed as revision 17064 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index be0abd4..c5c8878 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -6865,11 +6865,11 @@ static int decode_sei(H264Context *h){
         }while(get_bits(&s->gb, 8) == 255);
 
         switch(type){
-        case 1: // Picture timing SEI
+        case SEI_TYPE_PIC_TIMING: // Picture timing SEI
             if(decode_picture_timing(h) < 0)
                 return -1;
             break;
-        case 5:
+        case SEI_TYPE_USER_DATA_UNREGISTERED:
             if(decode_unregistered_user_data(h, size) < 0)
                 return -1;
             break;
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index e4e070a..ed9e854 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -112,6 +112,15 @@ enum {
 };
 
 /**
+ * SEI message types
+ */
+typedef enum {
+    SEI_TYPE_PIC_TIMING              =  1, ///< picture timing
+    SEI_TYPE_USER_DATA_UNREGISTERED  =  5, ///< unregistered user data
+    SEI_TYPE_RECOVERY_POINT          =  6  ///< recovery point (frame # to decoder sync)
+} SEI_Type;
+
+/**
  * pic_struct in picture timing SEI message
  */
 typedef enum {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list