diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 12:28:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 12:31:59 +0100 |
| commit | 21ff626ce0a6f3adf4b387e622e54a57c8e90fb0 (patch) | |
| tree | 516f52ac3ee910967016cb8175ebec9d69a9cafb /libavcodec/h261enc.c | |
| parent | 900fff89c9ede6ecd549397384007890fd8c8c6c (diff) | |
| parent | 01eac895ab350027467ffbe7278740f89ae8be75 (diff) | |
| download | ffmpeg-21ff626ce0a6f3adf4b387e622e54a57c8e90fb0.tar.gz | |
Merge commit '01eac895ab350027467ffbe7278740f89ae8be75'
* commit '01eac895ab350027467ffbe7278740f89ae8be75':
rtmpproto: Only prepend @setDataFrame for onMetaData and |RtmpSampleAccess
Conflicts:
libavformat/rtmpproto.c
See: 60fd790f381cd404ffdafa8a86a6dc93c9d80f99
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h261enc.c')
0 files changed, 0 insertions, 0 deletions