Merge commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Sep 2013 09:31:09 +0000 (11:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Sep 2013 09:31:13 +0000 (11:31 +0200)
* commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2':
  rtmp: Support AMF_DATA_TYPE_MIXEDARRAY

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtmppkt.c

Simple merge