Merge commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Dec 2012 14:30:12 +0000 (15:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Dec 2012 14:30:12 +0000 (15:30 +0100)
commit86b4dc6277691781015000763563d1baf212cdc7
treef4d95e42479b9c51ea8301f45a4f4575870d61fa
parent3b5c0f5e362f2ba7077e34e47e64dedd5f705dcb
parentbd255f9feb4deea4c990e582f0ba3b90d7b64b4c
Merge commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c'

* commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c':
  lavc: set frame parameters after decoding only if necessary

Conflicts:
libavcodec/utils.c

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