]> git.sesse.net Git - ffmpeg/commit - libavcodec/sparc/simple_idct_vis.c
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 13:09:31 +0000 (14:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 13:09:35 +0000 (14:09 +0100)
commit4fc339faea114873125b2bef1a8412059ab0e850
treef0a1e95a4e82010f0bac4d7725214c3406d560ec
parent9baef60ae4004c06e839cf1d4d6a5b225bb7d5d1
parent77eed91fab9b29426722f424fc39c109a8fa5b11
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmppkt: Rename the ts_delta field to ts_field

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