[FFmpeg-cvslog] Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 25 14:36:45 2013 +0100| [25be63005f0ba0b4cb8bf2569202ad0e89b4dae3] | committer: Michael Niedermayer

Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b'

* commit 'b85a5e87af4254b80913fe33591d96361f30832b':
  lavu: Add av_strnstr()
  h264: Allow discarding the cropping information from SPS

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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