Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 30 Mar 2012 20:10:17 +0000 (22:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 30 Mar 2012 20:10:17 +0000 (22:10 +0200)
commit2b6325cacb6def8e9de0455f575b51a8bd90b12c
tree9975f34681673f4ce96537ea6684ff0fa8f5df89
parent96df29c318ff64cb6ac706c11cbf932d96962fd7
parentb691fd7a4dfca766075c022922a75cdbca4e6d92
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: drop ff_h264_ prefix from static function ff_h264_decode_rbsp_trailing()
  h264: Make ff_h264_decode_end() static, it is not used externally.
  output-example: K&R formatting cosmetics, comment spelling fixes
  avf: make the example output the proper message
  avf: fix audio writing in the output-example
  mov: don't overwrite existing indexes.
  lzw: fix potential integer overflow.
  truemotion: forbid invalid VLC bitsizes and token values.
  truemotion2: handle out-of-frame motion vectors through edge extension.
  configure: Check for a different SDL function

Conflicts:
configure
doc/examples/muxing.c
libavcodec/truemotion2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
doc/examples/muxing.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/lzw.c
libavcodec/truemotion2.c
libavformat/mov.c