diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c
index 87723c5719aeb566dc373e8ec1c1ba4d77432d96..902d82252c883de4c29b4ebec9a2b1751619b09c 100644
--- a/libavcodec/cavs.c
+++ b/libavcodec/cavs.c
@@ -212,7 +212,7 @@ void ff_cavs_load_intra_pred_chroma(AVSContext *h) {
 
 static void intra_pred_vert(uint8_t *d,uint8_t *top,uint8_t *left,int stride) {
     int y;
-    uint64_t a = unaligned64(&top[1]);
+    uint64_t a = LD64(&top[1]);
     for(y=0;y<8;y++) {
         *((uint64_t *)(d+y*stride)) = a;
     }
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 8152288258e73601779b917e0e0b8b5118911567..736680852eb683039929a05c283cdc9c9596fdd0 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -124,7 +124,7 @@ const uint8_t *ff_find_start_code(const uint8_t * restrict p, const uint8_t *end
     }
 
     p= FFMIN(p, end)-4;
-    *state=  be2me_32(unaligned32(p));
+    *state= AV_RB32(p);
 
     return p+4;
 }