History

Merge remote-tracking branch 'qatar/master'

* qatar/master: movenc: Rudimentary IODs support. v410enc: fix output buffer size check v410enc: include correct headers fate: add -pix_fmt rgb48le to r210 test flvenc: Support muxing 16 kHz nellymoser configure: refactor list of programs into a variable fate: add r210 decoder test fate: split off Indeo FATE tests into their own file fate: split off ATRAC FATE tests into their own file fate: Add FATE tests for v410 encoder and decoder ARM: fix external symbol refs in rv40 asm westwood: Make sure audio header info is present when parsing audio packets libgsm: Reset the MS mode of GSM in the flush function libgsm: Set options on the right object ARM: dca: disable optimised decode_blockcodes() for old gcc Conflicts: configure libavformat/movenc.c libavformat/movenc.h tests/fate2.mak tests/ref/acodec/alac tests/ref/vsynth1/mpeg4 tests/ref/vsynth2/mpeg4

Michael Niedermayer committed 14 years ago

Commit 175cc372 parents 5666983 d3b8bde18 files · +101 −59Browse files

Showing the changes to libavcodec/arm (2 of 18 files). Show all

Unified · Split

2 files
  1. libavcodec/arm/dca.h +1 −1
  2. libavcodec/arm/rv40dsp_neon.S +2 −2
libavcodec/arm/dca.h+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 #include "config.h"
2626 #include "libavutil/intmath.h"
2727
28−#if HAVE_ARMV6 && HAVE_INLINE_ASM
28+#if HAVE_ARMV6 && HAVE_INLINE_ASM && AV_GCC_VERSION_AT_LEAST(4,4)
2929
3030 #define decode_blockcodes decode_blockcodes
3131 static inline int decode_blockcodes(int code1, int code2, int levels,
libavcodec/arm/rv40dsp_neon.S+2−2
@@ -372,7 +372,7 @@ endfunc · 371 unmodified lines
372372
373373 function ff_\type\()_rv40_qpel8_mc33_neon, export=1
374374 mov r3, #8
375− b ff_\type\()_pixels8_xy2_neon
375+ b X(ff_\type\()_pixels8_xy2_neon)
376376 endfunc
377377
378378 function ff_\type\()_rv40_qpel8_mc13_neon, export=1
@@ -652,7 +652,7 @@ endfunc · 273 unmodified lines
652652
653653 function ff_\type\()_rv40_qpel16_mc33_neon, export=1
654654 mov r3, #16
655− b ff_\type\()_pixels16_xy2_neon
655+ b X(ff_\type\()_pixels16_xy2_neon)
656656 endfunc
657657 .endm
658658

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t