[FFmpeg-cvslog] Merge commit '3b2fbe67bd63b00331db2a9b213f6d420418a312'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 15 19:39:06 2014 +0200| [098a699867e061a0ab549ada6c62b35739e40f55] | committer: Michael Niedermayer

Merge commit '3b2fbe67bd63b00331db2a9b213f6d420418a312'

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

Conflicts:
	libavcodec/options.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=098a699867e061a0ab549ada6c62b35739e40f55
---