Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jul 2014 13:54:17 +0000 (15:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jul 2014 14:17:27 +0000 (16:17 +0200)
commit3790801f9cedfae81cb8f055bbb0b14131459658
tree4fb4e35103252ce0a7cecf1d01041db506078894
parent020865f557ccf06a41ecc461fd13ce6678817d04
parent3c650efb81aaa3b395ba4606ee68a47ee4efb57b
Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'

* commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b':
  dsputil: Move draw_edges() to mpegvideoencdsp

Conflicts:
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
15 files changed:
libavcodec/diracdec.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideoencdsp.c
libavcodec/mpegvideoencdsp.h
libavcodec/snow.c
libavcodec/snow.h
libavcodec/snowenc.c
libavcodec/utils.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_x86.h
libavcodec/x86/mpegvideoencdsp_init.c