Merge commit '5e83d9aced2fc2b2e1360452794c58aba55d497c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Apr 2013 20:24:33 +0000 (22:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Apr 2013 20:46:51 +0000 (22:46 +0200)
commitf4b05cd8415ad6160900bb00565f9b75e356530e
treea1b89b58a5fd5d3d657d8135169ad39075a891be
parent05b2c998c7bfea642e3541787ab5dd3847e2ba81
parent5e83d9aced2fc2b2e1360452794c58aba55d497c
Merge commit '5e83d9aced2fc2b2e1360452794c58aba55d497c'

* commit '5e83d9aced2fc2b2e1360452794c58aba55d497c':
  h264: fully support cropping.

Conflicts:
doc/APIchanges
libavcodec/h264.c
libavcodec/h264_ps.c
libavcodec/options_table.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_ps.c
libavcodec/options_table.h
libavcodec/version.h