Index: libs/libmythtv/mpeg/H264Parser.h
===================================================================
--- libs/libmythtv/mpeg/H264Parser.h	(revision 19247)
+++ libs/libmythtv/mpeg/H264Parser.h	(working copy)
@@ -105,17 +105,17 @@
     bool onFrameStart(void) const { return on_frame; }
     bool onKeyFrameStart(void) const { return on_key_frame; }
 
-    uint pictureWidth(void) const { return pic_width; }
-    uint pictureHeight(void) const { return pic_height; }
+    int pictureWidth(void) const { return pic_width; }
+    int pictureHeight(void) const { return pic_height; }
 
     /** \brief Computes aspect ratio from picture size and sample aspect ratio
      */
-    uint aspectRatio(void) const;
+    int aspectRatio(void) const;
 
     uint64_t frameAUstreamOffset(void) const {return frame_start_offset;}
     uint64_t keyframeAUstreamOffset(void) const {return keyframe_start_offset;}
 
-    static int isKeySlice(uint slice_type)
+    static int isKeySlice(int slice_type)
         {
             return (slice_type == SLICE_I   ||
                     slice_type == SLICE_SI  ||
@@ -152,7 +152,7 @@
     uint8_t    NAL_type;
 
     int        prev_frame_num, frame_num;
-    uint       slice_type;
+    int        slice_type;
     int        prev_pic_parameter_set_id, pic_parameter_set_id;
     int8_t     prev_field_pic_flag, field_pic_flag;
     int8_t     prev_bottom_field_flag, bottom_field_flag;
@@ -162,10 +162,10 @@
     int        prev_delta_pic_order_cnt_bottom, delta_pic_order_cnt_bottom;
     int        prev_delta_pic_order_cnt[2], delta_pic_order_cnt[2];
     uint8_t    prev_nal_unit_type, nal_unit_type;
-    uint       prev_idr_pic_id, idr_pic_id;
+    int        prev_idr_pic_id, idr_pic_id;
 
-    uint       log2_max_frame_num, log2_max_pic_order_cnt_lsb;
-    uint       seq_parameter_set_id;
+    int        log2_max_frame_num, log2_max_pic_order_cnt_lsb;
+    int        seq_parameter_set_id;
 
     uint8_t    delta_pic_order_always_zero_flag;
     uint8_t    separate_colour_plane_flag;
@@ -173,16 +173,16 @@
     int8_t     pic_order_present_flag;
     int8_t     redundant_pic_cnt_present_flag;
 
-    uint       num_ref_frames;
-    uint       redundant_pic_cnt;
+    int        num_ref_frames;
+    int        redundant_pic_cnt;
 //    uint       pic_width_in_mbs, pic_height_in_map_units;
-    uint       pic_width, pic_height;
-    uint       frame_crop_left_offset;
-    uint       frame_crop_right_offset;
-    uint       frame_crop_top_offset;
-    uint       frame_crop_bottom_offset;
+    int        pic_width, pic_height;
+    int        frame_crop_left_offset;
+    int        frame_crop_right_offset;
+    int        frame_crop_top_offset;
+    int        frame_crop_bottom_offset;
     uint8_t    aspect_ratio_idc;
-    uint       sar_width, sar_height;
+    int        sar_width, sar_height;
 
     uint64_t   AU_offset, frame_start_offset, keyframe_start_offset;
     bool       on_frame, on_key_frame;
