Merge commit '93af2734ee609133eaeca28329d7f13241dd411f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jan 2013 15:14:41 +0000 (16:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jan 2013 15:14:41 +0000 (16:14 +0100)
commit5f61e09a8f28af45d7db1f5e7767d14322255f49
treedf4e8ce30cb60c7fe5a559529dcd2a03bdc22afb
parentdb23d5de27187dd8f2ec5c6dfd98a8a363b0fda5
parent93af2734ee609133eaeca28329d7f13241dd411f
Merge commit '93af2734ee609133eaeca28329d7f13241dd411f'

* commit '93af2734ee609133eaeca28329d7f13241dd411f':
  lavc: put FF_IDCT_{VP3,H264,CAVS,BINK,EA,WMV2} under FF_API_IDCT.

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/bfin/dsputil_bfin.c
libavcodec/bink.c
libavcodec/mss2.c
libavcodec/options_table.h
libavcodec/vc1dec.c
libavcodec/version.h