Commit ad98af27 authored by Clément Bœsch's avatar Clément Bœsch

Merge commit 'de2ae3c1'

* commit 'de2ae3c1':
  lavc: add clobber tests for the new encoding/decoding API

The merge only re-order what we already have.
Merged-by: 's avatarClément Bœsch <u@pkh.me>
parents 4cca2f74 de2ae3c1
...@@ -6152,11 +6152,11 @@ enabled neon_clobber_test && ...@@ -6152,11 +6152,11 @@ enabled neon_clobber_test &&
-Wl,--wrap,avcodec_decode_subtitle2 \ -Wl,--wrap,avcodec_decode_subtitle2 \
-Wl,--wrap,avcodec_encode_audio2 \ -Wl,--wrap,avcodec_encode_audio2 \
-Wl,--wrap,avcodec_encode_video2 \ -Wl,--wrap,avcodec_encode_video2 \
-Wl,--wrap,avcodec_encode_subtitle \
-Wl,--wrap,avcodec_send_packet \ -Wl,--wrap,avcodec_send_packet \
-Wl,--wrap,avcodec_receive_frame \
-Wl,--wrap,avcodec_send_frame \
-Wl,--wrap,avcodec_receive_packet \ -Wl,--wrap,avcodec_receive_packet \
-Wl,--wrap,avcodec_encode_subtitle \ -Wl,--wrap,avcodec_send_frame \
-Wl,--wrap,avcodec_receive_frame \
-Wl,--wrap,swr_convert \ -Wl,--wrap,swr_convert \
-Wl,--wrap,avresample_convert || -Wl,--wrap,avresample_convert ||
disable neon_clobber_test disable neon_clobber_test
...@@ -6170,9 +6170,9 @@ enabled xmm_clobber_test && ...@@ -6170,9 +6170,9 @@ enabled xmm_clobber_test &&
-Wl,--wrap,avcodec_encode_video2 \ -Wl,--wrap,avcodec_encode_video2 \
-Wl,--wrap,avcodec_encode_subtitle \ -Wl,--wrap,avcodec_encode_subtitle \
-Wl,--wrap,avcodec_send_packet \ -Wl,--wrap,avcodec_send_packet \
-Wl,--wrap,avcodec_receive_frame \
-Wl,--wrap,avcodec_send_frame \
-Wl,--wrap,avcodec_receive_packet \ -Wl,--wrap,avcodec_receive_packet \
-Wl,--wrap,avcodec_send_frame \
-Wl,--wrap,avcodec_receive_frame \
-Wl,--wrap,swr_convert \ -Wl,--wrap,swr_convert \
-Wl,--wrap,avresample_convert \ -Wl,--wrap,avresample_convert \
-Wl,--wrap,sws_scale || -Wl,--wrap,sws_scale ||
......
...@@ -83,9 +83,9 @@ wrap(avcodec_send_packet(AVCodecContext *avctx, const AVPacket *avpkt)) ...@@ -83,9 +83,9 @@ wrap(avcodec_send_packet(AVCodecContext *avctx, const AVPacket *avpkt))
testneonclobbers(avcodec_send_packet, avctx, 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)) wrap(avcodec_send_frame(AVCodecContext *avctx, const AVFrame *frame))
...@@ -93,7 +93,7 @@ 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); 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);
} }
...@@ -83,9 +83,9 @@ wrap(avcodec_send_packet(AVCodecContext *avctx, const AVPacket *avpkt)) ...@@ -83,9 +83,9 @@ wrap(avcodec_send_packet(AVCodecContext *avctx, const AVPacket *avpkt))
testneonclobbers(avcodec_send_packet, avctx, 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)) wrap(avcodec_send_frame(AVCodecContext *avctx, const AVFrame *frame))
...@@ -93,7 +93,7 @@ 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); 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);
} }
...@@ -83,9 +83,9 @@ wrap(avcodec_send_packet(AVCodecContext *avctx, const AVPacket *avpkt)) ...@@ -83,9 +83,9 @@ wrap(avcodec_send_packet(AVCodecContext *avctx, const AVPacket *avpkt))
testxmmclobbers(avcodec_send_packet, avctx, avpkt); testxmmclobbers(avcodec_send_packet, avctx, avpkt);
} }
wrap(avcodec_receive_frame(AVCodecContext *avctx, AVFrame *frame)) wrap(avcodec_receive_packet(AVCodecContext *avctx, AVPacket *avpkt))
{ {
testxmmclobbers(avcodec_receive_frame, avctx, frame); testxmmclobbers(avcodec_receive_packet, avctx, avpkt);
} }
wrap(avcodec_send_frame(AVCodecContext *avctx, const AVFrame *frame)) wrap(avcodec_send_frame(AVCodecContext *avctx, const AVFrame *frame))
...@@ -93,7 +93,7 @@ wrap(avcodec_send_frame(AVCodecContext *avctx, const AVFrame *frame)) ...@@ -93,7 +93,7 @@ wrap(avcodec_send_frame(AVCodecContext *avctx, const AVFrame *frame))
testxmmclobbers(avcodec_send_frame, avctx, frame); testxmmclobbers(avcodec_send_frame, avctx, frame);
} }
wrap(avcodec_receive_packet(AVCodecContext *avctx, AVPacket *avpkt)) wrap(avcodec_receive_frame(AVCodecContext *avctx, AVFrame *frame))
{ {
testxmmclobbers(avcodec_receive_packet, avctx, avpkt); testxmmclobbers(avcodec_receive_frame, avctx, frame);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment