[FFmpeg-devel] [PATCH 4/6] h264_changesps_bsf: fix compilation

[Christophe Gisquet]

---
 libavcodec/h264_changesps_bsf.c | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/libavcodec/h264_changesps_bsf.c b/libavcodec/h264_changesps_bsf.c
index 5daea89..a166748 100644
--- a/libavcodec/h264_changesps_bsf.c
+++ b/libavcodec/h264_changesps_bsf.c
@@ -21,26 +21,8 @@
 
 #include "avcodec.h"
 #include "golomb.h"
-
-extern AVRational pixel_aspect[];
-
-// NAL unit types, copied from h264.h
-enum {
-    NAL_SLICE=1,
-    NAL_DPA,
-    NAL_DPB,
-    NAL_DPC,
-    NAL_IDR_SLICE,
-    NAL_SEI,
-    NAL_SPS,
-    NAL_PPS,
-    NAL_AUD,
-    NAL_END_SEQUENCE,
-    NAL_END_STREAM,
-    NAL_FILLER_DATA,
-    NAL_SPS_EXT,
-    NAL_AUXILIARY_SLICE=19
-};
+#include "h264.h"
+#include "h264data.h"
 
 typedef struct H264SPSContext {
     uint8_t state;
@@ -114,7 +96,7 @@ static int parse_args(struct H264SPSContext *c, const char *args)
         int i;
         c->predefined_sar = 255;
         for (i = 1; i < 17; i++)
-            if (pixel_aspect[i].den * sarx == pixel_aspect[i].num * sary) {
+            if (ff_h264_pixel_aspect[i].den * sarx == ff_h264_pixel_aspect[i].num * sary) {
                c->predefined_sar = i;
                break;
             }
-- 
1.9.2.msysgit.0