diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 22:00:34 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 22:11:56 +0400 |
| commit | c1df467d73ee8c6e792ec27c126c5f0e2bc1af9d (patch) | |
| tree | f25896738e158d2744a4e72b1e21618cda4ba3bb /libavcodec/arm | |
| parent | 9c712d0b1608ec998dbe41d81a79f3fb7ea32b4d (diff) | |
| parent | 835f798c7d20bca89eb4f3593846251ad0d84e4b (diff) | |
Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b'
* commit '835f798c7d20bca89eb4f3593846251ad0d84e4b':
mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes
Conflicts:
libavcodec/h261dec.c
libavcodec/intrax8.c
libavcodec/mjpegenc.c
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/x86/mpegvideoenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/mpegvideo_arm.c | 4 | ||||
| -rw-r--r-- | libavcodec/arm/mpegvideo_arm.h | 2 | ||||
| -rw-r--r-- | libavcodec/arm/mpegvideo_armv5te.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/arm/mpegvideo_arm.c b/libavcodec/arm/mpegvideo_arm.c index 5f5473d28c..918be16d03 100644 --- a/libavcodec/arm/mpegvideo_arm.c +++ b/libavcodec/arm/mpegvideo_arm.c @@ -40,12 +40,12 @@ void ff_dct_unquantize_h263_inter_neon(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_h263_intra_neon(MpegEncContext *s, int16_t *block, int n, int qscale); -av_cold void ff_MPV_common_init_arm(MpegEncContext *s) +av_cold void ff_mpv_common_init_arm(MpegEncContext *s) { int cpu_flags = av_get_cpu_flags(); if (have_armv5te(cpu_flags)) - ff_MPV_common_init_armv5te(s); + ff_mpv_common_init_armv5te(s); if (have_neon(cpu_flags)) { s->dct_unquantize_h263_intra = ff_dct_unquantize_h263_intra_neon; diff --git a/libavcodec/arm/mpegvideo_arm.h b/libavcodec/arm/mpegvideo_arm.h index 78e07e15c5..709ae6b247 100644 --- a/libavcodec/arm/mpegvideo_arm.h +++ b/libavcodec/arm/mpegvideo_arm.h @@ -21,6 +21,6 @@ #include "libavcodec/mpegvideo.h" -void ff_MPV_common_init_armv5te(MpegEncContext *s); +void ff_mpv_common_init_armv5te(MpegEncContext *s); #endif /* AVCODEC_ARM_MPEGVIDEO_ARM_H */ diff --git a/libavcodec/arm/mpegvideo_armv5te.c b/libavcodec/arm/mpegvideo_armv5te.c index a5722900a8..88c5f4fdad 100644 --- a/libavcodec/arm/mpegvideo_armv5te.c +++ b/libavcodec/arm/mpegvideo_armv5te.c @@ -95,7 +95,7 @@ static void dct_unquantize_h263_inter_armv5te(MpegEncContext *s, ff_dct_unquantize_h263_armv5te(block, qmul, qadd, nCoeffs + 1); } -av_cold void ff_MPV_common_init_armv5te(MpegEncContext *s) +av_cold void ff_mpv_common_init_armv5te(MpegEncContext *s) { s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_armv5te; s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_armv5te; |