Merge commit '38c1466ca41c73c7ce347da702362cb69c151716'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jan 2013 12:34:30 +0000 (13:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jan 2013 12:34:30 +0000 (13:34 +0100)
commite7e14bc69a606a6bec82efef729263cd38f122d4
treeb88a8db08cebe2a851d7f4179696cd89af7e7a45
parent25c75525bf1da38179ec67924f0be7a2bd8faa0d
parent38c1466ca41c73c7ce347da702362cb69c151716
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>
doc/APIchanges
doc/texi2pod.pl
libavutil/dict.c
libavutil/dict.h
libavutil/version.h