RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 16:52:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'de2ae3c1fae5a2eb539b9abd7bc2a9ca8c286ff0'

Browse Source 
* 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>
This commit is contained in:
Clément Bœsch 2017-03-21 13:09:26 +01:00
commit ad98af27f7
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -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_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_encode_subtitle \
-Wl,--wrap,avcodec_send_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 ||
disable neon_clobber_test disable neon_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 ||

8
libavcodec/aarch64/neontest.c
View File

@ -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))
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);
} }

8
libavcodec/arm/neontest.c
View File

@ -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))
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);
} }

8
libavcodec/x86/w64xmmtest.c
View File

@ -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))
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);
} }