diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 11:31:09 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 11:31:13 +0200 |
commit | f3a02f4bc1d05f1eb062fa9f5b6f20ba8991e952 (patch) | |
tree | 6888d77ee48d3ae88b4095b7feb9e944841ad933 /libavcodec/libxvid.h | |
parent | 3cfd4df8e7220595a8c3e752687195b445083001 (diff) | |
parent | 32a414f316c7f0eea877370e3f9d9f25afbf5da2 (diff) | |
download | ffmpeg-f3a02f4bc1d05f1eb062fa9f5b6f20ba8991e952.tar.gz |
Merge commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2'
* commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2':
rtmp: Support AMF_DATA_TYPE_MIXEDARRAY
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libxvid.h')
0 files changed, 0 insertions, 0 deletions