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)
commit51c5768cca3b69c6ff5e0e252d0c6c7e1e0feb82
tree586c3de95fb7e5cea6fe1770c9dac7b59190245d
parent7b91e9cf5dc7b46216aa4da79943aecf9425ab04
parentce6949d3a0607eb318dc2872553110df934e9720
Merge commit 'ce6949d3a0607eb318dc2872553110df934e9720'

* commit 'ce6949d3a0607eb318dc2872553110df934e9720':
  oggparsetheora: stop using deprecated avcodec_set_dimensions

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