diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 14:09:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 14:09:35 +0100 |
| commit | 4fc339faea114873125b2bef1a8412059ab0e850 (patch) | |
| tree | f0a1e95a4e82010f0bac4d7725214c3406d560ec /libavcodec | |
| parent | 9baef60ae4004c06e839cf1d4d6a5b225bb7d5d1 (diff) | |
| parent | 77eed91fab9b29426722f424fc39c109a8fa5b11 (diff) | |
| download | ffmpeg-4fc339faea114873125b2bef1a8412059ab0e850.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmppkt: Rename the ts_delta field to ts_field
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions