[FFmpeg-cvslog] Merge commit '5e83d9aced2fc2b2e1360452794c58aba55d497c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 19 22:24:33 2013 +0200| [f4b05cd8415ad6160900bb00565f9b75e356530e] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f4b05cd8415ad6160900bb00565f9b75e356530e
---