Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Jun 2012 22:33:42 +0000 (00:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Jun 2012 22:33:42 +0000 (00:33 +0200)
commit7d82020fcb7f81fcbbd30b7546ba62af45f1a33c
tree16504cac144fc1a8adf7822c642bb27a4c20c427
parente10eac910a2df9a2a37f13a1a0876698b240f334
parent19dfbf1915a0739f1a8b2f5a56aa1d3ff0597d9c
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  librtmp: return AVERROR_UNKNOWN instead of -1.
  librtmp: don't abuse a variable for two unrelated things.
  librtmp: add rtmp_app and rtmp_playpath private options.
  bmv: add stricter checks for invalid decoded length
  avpacket: fix duplicating side data.
  flv: support stream text data as onTextData

Conflicts:
libavcodec/bmv.c
libavformat/flvdec.c
libavformat/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avpacket.c
libavcodec/bmv.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/librtmp.c