Merge commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 12:46:09 +0000 (13:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 12:46:23 +0000 (13:46 +0100)
commitad9a6e19e1a8abc0ce12ff85f9f3aaf321f16866
treeade9f7014de33eb08b3645b581249b0935e9ba24
parent3e3b0b3a40ee44343a6db7285734fe4c80718f28
parentd24e9a99a40166bf881ccd2e3ae5688af4726658
Merge commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658'

* commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658':
  h264 does not depend on mpegvideo any more

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cavlc.c
libavcodec/h264_direct.c
libavcodec/h264_loopfilter.c
libavcodec/h264data.h
libavcodec/svq3.c