Merge commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 11:45:07 +0000 (12:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 11:45:07 +0000 (12:45 +0100)
commit932d8d790ccf4e8ce67b97057e5aaf738bbfc65a
tree84857db0f1a924e3b1ebf664122c203cffb94508
parent010adacbe2363a5f98d62db8fae7b0009552b801
parent277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2
Merge commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2'

* commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2':
  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>
libavcodec/h263.h
libavcodec/h264_cabac.c
libavutil/internal.h