diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 13:34:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 13:34:30 +0100 |
| commit | e7e14bc69a606a6bec82efef729263cd38f122d4 (patch) | |
| tree | b88a8db08cebe2a851d7f4179696cd89af7e7a45 /libavcodec/libx264.c | |
| parent | 25c75525bf1da38179ec67924f0be7a2bd8faa0d (diff) | |
| parent | 38c1466ca41c73c7ce347da702362cb69c151716 (diff) | |
| download | ffmpeg-e7e14bc69a606a6bec82efef729263cd38f122d4.tar.gz | |
Merge commit '38c1466ca41c73c7ce347da702362cb69c151716'
* commit '38c1466ca41c73c7ce347da702362cb69c151716':
dict: add av_dict_parse_string()
doc: support multitable in texi2pod
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libx264.c')
0 files changed, 0 insertions, 0 deletions