diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-21 13:09:26 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-21 14:43:53 +0100 |
| commit | ad98af27f7100a80fd5ff934ddc7e9aca94f0496 (patch) | |
| tree | e3f3e2b05113e8150f968927ee2619e1a099d45f | |
| parent | 4cca2f74f25331067cfb234328411bd114664871 (diff) | |
| parent | de2ae3c1fae5a2eb539b9abd7bc2a9ca8c286ff0 (diff) | |
| download | ffmpeg-ad98af27f7100a80fd5ff934ddc7e9aca94f0496.tar.gz | |
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>
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | libavcodec/aarch64/neontest.c | 8 | ||||
| -rw-r--r-- | libavcodec/arm/neontest.c | 8 | ||||
| -rw-r--r-- | libavcodec/x86/w64xmmtest.c | 8 |
4 files changed, 17 insertions, 17 deletions
@@ -6152,11 +6152,11 @@ enabled neon_clobber_test && -Wl,--wrap,avcodec_decode_subtitle2 \ -Wl,--wrap,avcodec_encode_audio2 \ -Wl,--wrap,avcodec_encode_video2 \ + -Wl,--wrap,avcodec_encode_subtitle \ -Wl,--wrap,avcodec_send_packet \ - -Wl,--wrap,avcodec_receive_frame \ - -Wl,--wrap,avcodec_send_frame \ -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,avresample_convert || disable neon_clobber_test @@ -6170,9 +6170,9 @@ enabled xmm_clobber_test && -Wl,--wrap,avcodec_encode_video2 \ -Wl,--wrap,avcodec_encode_subtitle \ -Wl,--wrap,avcodec_send_packet \ - -Wl,--wrap,avcodec_receive_frame \ - -Wl,--wrap,avcodec_send_frame \ -Wl,--wrap,avcodec_receive_packet \ + -Wl,--wrap,avcodec_send_frame \ + -Wl,--wrap,avcodec_receive_frame \ -Wl,--wrap,swr_convert \ -Wl,--wrap,avresample_convert \ -Wl,--wrap,sws_scale || diff --git a/libavcodec/aarch64/neontest.c b/libavcodec/aarch64/neontest.c index 1e9ef167e3..a24c22dd30 100644 --- a/libavcodec/aarch64/neontest.c +++ b/libavcodec/aarch64/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); } 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); } diff --git a/libavcodec/x86/w64xmmtest.c b/libavcodec/x86/w64xmmtest.c index 987fa51e26..8f2b8a6299 100644 --- a/libavcodec/x86/w64xmmtest.c +++ b/libavcodec/x86/w64xmmtest.c @@ -83,9 +83,9 @@ wrap(avcodec_send_packet(AVCodecContext *avctx, const AVPacket *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)) @@ -93,7 +93,7 @@ wrap(avcodec_send_frame(AVCodecContext *avctx, const AVFrame *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); } |