• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 7d82020f
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7d82020f
bmv.c 11.3 KB