Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Jan 2013 13:36:45 +0000 (14:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Jan 2013 13:36:45 +0000 (14:36 +0100)
commit25be63005f0ba0b4cb8bf2569202ad0e89b4dae3
tree43bf6b49aa89942207f0937cfcab374524795a8f
parentb2d0c5bd13ab100a3acb18e9c869d73904e6e764
parentb85a5e87af4254b80913fe33591d96361f30832b
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@gmx.at>
Changelog
doc/APIchanges
libavcodec/avcodec.h
libavcodec/h264_ps.c
libavcodec/options_table.h
libavcodec/version.h
libavutil/avstring.c
libavutil/avstring.h
libavutil/version.h