Merge commit '3b2fbe67bd63b00331db2a9b213f6d420418a312'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 May 2014 17:39:06 +0000 (19:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 May 2014 17:39:06 +0000 (19:39 +0200)
commit098a699867e061a0ab549ada6c62b35739e40f55
tree520b4ea1d587a7ff20df319c8e7bdd1abdf8aad4
parent9b7cb02319b65596b5ef106a830fd813248fb580
parent3b2fbe67bd63b00331db2a9b213f6d420418a312
Merge commit '3b2fbe67bd63b00331db2a9b213f6d420418a312'

* commit '3b2fbe67bd63b00331db2a9b213f6d420418a312':
  lavc: properly handle subtitle_header in avcodec_copy_context()

Conflicts:
libavcodec/options.c

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