Merge commit 'ce6949d3a0607eb318dc2872553110df934e9720'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 12:15:13 +0000 (13:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 12:15:21 +0000 (13:15 +0100)
* commit 'ce6949d3a0607eb318dc2872553110df934e9720':
  oggparsetheora: stop using deprecated avcodec_set_dimensions

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

Simple merge