Merge commit 'cb70a93ca1e7fae1b5dfb65ad149d311a65206a4'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 20:25:07 +0000 (21:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 20:25:07 +0000 (21:25 +0100)
commit2980c8e7d34e84f98b09965d208a583a16d5aded
tree7ce6ba4bf3489d1577f5ae82656641147a843fab
parent79216a189b4e55dd3dbeb49612111061f2c2b717
parentcb70a93ca1e7fae1b5dfb65ad149d311a65206a4
Merge commit 'cb70a93ca1e7fae1b5dfb65ad149d311a65206a4'

* commit 'cb70a93ca1e7fae1b5dfb65ad149d311a65206a4':
  lavc: Document interaction between avcodec_open2() and decoding routines

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h