Merge commit 'c80a816142699dea9cf9fa66689a7838a487ed7e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 13 Oct 2014 22:03:43 +0000 (00:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 13 Oct 2014 22:04:18 +0000 (00:04 +0200)
* commit 'c80a816142699dea9cf9fa66689a7838a487ed7e':
  h263dec: call get_format() on resolution changes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h263dec.c

Simple merge