Merge commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jun 2015 20:11:43 +0000 (22:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jun 2015 20:11:43 +0000 (22:11 +0200)
commit20526f2e2f58cb226e9891aec7d7e438a7ddb6d2
tree42b57f0395b81a30dc496e215c3ebe933101e794
parent4ed3a01d717f120ba6881815ad6c40ad3f625825
parent9af7e8045e3e63ab39adedae9a7c11b1c410af26
Merge commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26'

* commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26':
  lavc: Clarify the behaviour of dimension and format context fields

Conflicts:
libavcodec/avcodec.h

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