aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-13 22:39:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-13 22:39:54 +0200
commit2ba45778095cdd6e1438644e4797b76e9de6c672 (patch)
tree6d7ef68dc6929b79854a0e9803cdb69bc70501e4 /ffserver.c
parented8e6d535cf4c56d82f9c91646dfc42787b719d6 (diff)
parenta8c104a511f97e4ea617df73b31737e28a8a5126 (diff)
downloadffmpeg-2ba45778095cdd6e1438644e4797b76e9de6c672.tar.gz
Merge commit 'a8c104a511f97e4ea617df73b31737e28a8a5126'
* commit 'a8c104a511f97e4ea617df73b31737e28a8a5126': AVOption: add support for dictionary types. Conflicts: libavutil/opt.c libavutil/opt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions