Merge commit '218aefce'
* commit '218aefce': dsputil: Move LOCAL_ALIGNED macros to libavutil Conflicts: libavcodec/dvdec.c libavcodec/imc.c libavcodec/mpegvideo_motion.c Merged-by:Michael Niedermayer <michaelni@gmx.at>
No related branches found
No related tags found
Showing
- libavcodec/aacps.c 1 addition, 1 deletionlibavcodec/aacps.c
- libavcodec/aacsbr.c 1 addition, 0 deletionslibavcodec/aacsbr.c
- libavcodec/ac3enc.c 1 addition, 1 deletionlibavcodec/ac3enc.c
- libavcodec/ac3enc_template.c 1 addition, 0 deletionslibavcodec/ac3enc_template.c
- libavcodec/bink.c 1 addition, 0 deletionslibavcodec/bink.c
- libavcodec/dcadec.c 1 addition, 1 deletionlibavcodec/dcadec.c
- libavcodec/dnxhdenc.c 1 addition, 0 deletionslibavcodec/dnxhdenc.c
- libavcodec/dsputil.c 1 addition, 0 deletionslibavcodec/dsputil.c
- libavcodec/dsputil.h 0 additions, 26 deletionslibavcodec/dsputil.h
- libavcodec/dv.c 1 addition, 0 deletionslibavcodec/dv.c
- libavcodec/dvdec.c 1 addition, 1 deletionlibavcodec/dvdec.c
- libavcodec/h264_loopfilter.c 1 addition, 1 deletionlibavcodec/h264_loopfilter.c
- libavcodec/imc.c 1 addition, 0 deletionslibavcodec/imc.c
- libavcodec/ituh263dec.c 1 addition, 0 deletionslibavcodec/ituh263dec.c
- libavcodec/mpc7.c 1 addition, 0 deletionslibavcodec/mpc7.c
- libavcodec/mpegvideo_enc.c 1 addition, 0 deletionslibavcodec/mpegvideo_enc.c
- libavcodec/mpegvideo_motion.c 2 additions, 0 deletionslibavcodec/mpegvideo_motion.c
- libavcodec/ppc/mpegaudiodec_altivec.c 1 addition, 1 deletionlibavcodec/ppc/mpegaudiodec_altivec.c
- libavcodec/ra288.c 1 addition, 0 deletionslibavcodec/ra288.c
- libavcodec/rv34.c 0 additions, 1 deletionlibavcodec/rv34.c
Loading
Please register or sign in to comment