History

Merge remote-tracking branch 'qatar/master'

* qatar/master: ARM: allow runtime masking of CPU features dsputil: remove unused functions mov: Treat keyframe indexes as 1-origin if starting at non-zero. mov: Take stps entries into consideration also about key_off. Remove lowres video decoding Conflicts: ffmpeg.c ffplay.c libavcodec/arm/vp8dsp_init_arm.c libavcodec/libopenjpegdec.c libavcodec/mjpegdec.c libavcodec/mpegvideo.c libavcodec/utils.c libavformat/mov.c

Michael Niedermayer committed 14 years ago

Commit 92ef4be2 parents 2e07f42 d526c5352 files · +219 −841Browse files

Showing the changes to libavcodec/ppc (1 of 52 files). Show all

Unified · Split

libavcodec/ppc/dsputil_ppc.c+1−1
@@ -187,7 +187,7 @@ void ff_dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx) · 186 unmodified lines
187187 }
188188 #endif //CONFIG_ENCODERS
189189
190− if (avctx->lowres == 0 && avctx->bits_per_raw_sample <= 8) {
190+ if (avctx->bits_per_raw_sample <= 8) {
191191 if ((avctx->idct_algo == FF_IDCT_AUTO) ||
192192 (avctx->idct_algo == FF_IDCT_ALTIVEC)) {
193193 c->idct_put = ff_idct_put_altivec;

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