diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 13:12:06 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 13:12:11 +0100 |
commit | 72ad824a86233fb0c81a1581a1a7e6468dca6b0f (patch) | |
tree | d0b0b3a5141fe43d8c15a5050813ceb583fee751 /libavutil/dict.c | |
parent | df4517106a3ca494bbdd9c42a5eae1f74f8c3ad3 (diff) | |
parent | f1b716c79b958156e04d5d1683e7e53152cfe914 (diff) | |
download | ffmpeg-72ad824a86233fb0c81a1581a1a7e6468dca6b0f.tar.gz |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
avframe: Copy buffer type in copy_props.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/dict.c')
0 files changed, 0 insertions, 0 deletions