Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 04:59:01 +0000 (05:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 05:05:19 +0000 (06:05 +0100)
commita81a2b514eec4614fca277c0cbd8f5a1dbe2946e
tree4b0f175b2b90be9e667297f9eba01395fe80530b
parent6102dda1d754925e384e7e195441b1e6cd6d9a9c
parent5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27
Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'

* commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27':
  h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define

Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_ps.c