-
Michael Niedermayer authored
* commit '277ff7f5': lavu: move internal define to the only places where it is used Conflicts: libavcodec/h264_cabac.c libavutil/internal.h Merged-by:
Michael Niedermayer <michaelni@gmx.at>
932d8d79
* commit '277ff7f5': lavu: move internal define to the only places where it is used Conflicts: libavcodec/h264_cabac.c libavutil/internal.h Merged-by:Michael Niedermayer <michaelni@gmx.at>