Merge commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 10:15:01 +0000 (12:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 10:15:01 +0000 (12:15 +0200)
commit6fc58a8cb6707087e31fa8396a9e73c6f7595638
tree903d7eebf1d0bc708be1ad3139bce3f045b254f1
parente91339cde25afff244b1f5cb2fc206f3dc9570d8
parent507b1e454cf9953da3e18f33c9bd1fca78c97cb5
Merge commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5'

* commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5':
  avcodec: Add field order information to AVCodecParserContext.

Conflicts:
doc/APIchanges
libavcodec/version.h

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