]> git.sesse.net Git - ffmpeg/commit
Merge commit 'ba5393a609c723ec8ab7f9727c10fef734c09278'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 09:11:31 +0000 (11:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 09:11:40 +0000 (11:11 +0200)
commit06186a3160d031b80c8772a646ab98c27b78d011
tree1b6f274f2a7fcf782ecdf1cde93462ddbb3295cb
parenta2b0699f4f0a9b16382fb66616cd009f7ba6552f
parentba5393a609c723ec8ab7f9727c10fef734c09278
Merge commit 'ba5393a609c723ec8ab7f9727c10fef734c09278'

* commit 'ba5393a609c723ec8ab7f9727c10fef734c09278':
  rtmp: rename data_size to size

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