ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Nov 28
12:28:15 2014 +0100| [21ff626ce0a6f3adf4b387e622e54a57c8e90fb0] | committer:
Michael Niedermayer
Merge commit '01eac895ab350027467ffbe7278740f89ae8be75'
* commit '01eac895ab350027467ffbe7278740f89ae8be75':
rtmpproto: Only prepend @setDataFrame for onMetaData and |RtmpSampleAccess
Conflicts:
libavformat/rtmpproto.c
See: 60fd790f381cd404ffdafa8a86a6dc93c9d80f99
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21ff626ce0a6f3adf4b387e622e54a57c8e90fb0
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
