Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Sep 2012 13:30:24 +0000 (15:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Sep 2012 13:30:34 +0000 (15:30 +0200)
commit8846115b1a5c29892fdf2c74747f71d37e16e864
tree4ab64b8114601175846df80eedfa3ea7d49df657
parent67d501b4f1758ba0783b14da4a6b3abd506792fa
parentb16d001b628237c93529c2be169ea5af1be7c9d7
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rv34: use ff_MPV_common_frame_size_change()
  mpegvideo: add reinit function for frame parameter changes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/rv34.c