Merge commit '01eac895ab350027467ffbe7278740f89ae8be75'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 11:28:15 +0000 (12:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 11:31:59 +0000 (12:31 +0100)
* commit '01eac895ab350027467ffbe7278740f89ae8be75':
  rtmpproto: Only prepend @setDataFrame for onMetaData and |RtmpSampleAccess

Conflicts:
libavformat/rtmpproto.c

See: 60fd790f381cd404ffdafa8a86a6dc93c9d80f99
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtmpproto.c

@@@ -2970,10 -2949,8 +2970,9 @@@ static int rtmp_write(URLContext *s, co
          }
  
          if (rt->flv_header_bytes < RTMP_HEADER) {
-             int set_data_frame = 0;
              const uint8_t *header = rt->flv_header;
              int channel = RTMP_AUDIO_CHANNEL;
 +
              copy = FFMIN(RTMP_HEADER - rt->flv_header_bytes, size_temp);
              bytestream_get_buffer(&buf_temp, rt->flv_header + rt->flv_header_bytes, copy);
              rt->flv_header_bytes += copy;