aboutsummaryrefslogtreecommitdiff
path: root/libavcodec/arm
diff options
context:
space:
mode:
authorClément Bœsch2017-03-21 13:09:26 +0100
committerClément Bœsch2017-03-21 14:43:53 +0100
commitad98af27f7100a80fd5ff934ddc7e9aca94f0496 (patch)
treee3f3e2b05113e8150f968927ee2619e1a099d45f /libavcodec/arm
parent4cca2f74f25331067cfb234328411bd114664871 (diff)
parentde2ae3c1fae5a2eb539b9abd7bc2a9ca8c286ff0 (diff)
Merge commit 'de2ae3c1fae5a2eb539b9abd7bc2a9ca8c286ff0'
* commit 'de2ae3c1fae5a2eb539b9abd7bc2a9ca8c286ff0': lavc: add clobber tests for the new encoding/decoding API The merge only re-order what we already have. Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/arm')
-rw-r--r--libavcodec/arm/neontest.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/arm/neontest.c b/libavcodec/arm/neontest.c
index 56f950abe0..f9c0dbf12e 100644
--- a/libavcodec/arm/neontest.c
+++ b/libavcodec/arm/neontest.c
@@ -83,9 +83,9 @@ wrap(avcodec_send_packet(AVCodecContext *avctx, const AVPacket *avpkt))
testneonclobbers(avcodec_send_packet, avctx, avpkt);
}
-wrap(avcodec_receive_frame(AVCodecContext *avctx, AVFrame *frame))
+wrap(avcodec_receive_packet(AVCodecContext *avctx, AVPacket *avpkt))
{
- testneonclobbers(avcodec_receive_frame, avctx, frame);
+ testneonclobbers(avcodec_receive_packet, avctx, avpkt);
}
wrap(avcodec_send_frame(AVCodecContext *avctx, const AVFrame *frame))
@@ -93,7 +93,7 @@ wrap(avcodec_send_frame(AVCodecContext *avctx, const AVFrame *frame))
testneonclobbers(avcodec_send_frame, avctx, frame);
}
-wrap(avcodec_receive_packet(AVCodecContext *avctx, AVPacket *avpkt))
+wrap(avcodec_receive_frame(AVCodecContext *avctx, AVFrame *frame))
{
- testneonclobbers(avcodec_receive_packet, avctx, avpkt);
+ testneonclobbers(avcodec_receive_frame, avctx, frame);
}