Merge commit 'a17a7661906ba295d67afd80ac0770422e1b02b3'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 19:18:03 +0000 (21:18 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 19:41:53 +0000 (21:41 +0200)
commitee573b4d31d49280df0fbec61af6184130d26737
tree46f462f7e70dadd32d21e932449cd3124404a7a2
parent37498a4b202e332e690ba02b9ab04afcbb08c9a5
parenta17a7661906ba295d67afd80ac0770422e1b02b3
Merge commit 'a17a7661906ba295d67afd80ac0770422e1b02b3'

* commit 'a17a7661906ba295d67afd80ac0770422e1b02b3':
  lavc: Add data and linesize to AVSubtitleRect

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/dvbsub.c
libavcodec/dvbsubdec.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/pgssubdec.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/xsubdec.c
libavcodec/xsubenc.c