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)
commitb9918a7688024b178cbfa96ff30362b6eb4f611c
tree19cfe7431ce93c2cbdaa35740655db60b4e0d180
parent40f2b16d527319ad8dfd78a7925b984dc05cfa9e
parentc80a816142699dea9cf9fa66689a7838a487ed7e
Merge commit 'c80a816142699dea9cf9fa66689a7838a487ed7e'

* commit 'c80a816142699dea9cf9fa66689a7838a487ed7e':
  h263dec: call get_format() on resolution changes

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