Changeset 151f88d5 in ffmpeg

Timestamp:

Jun 5, 2014, 4:55:44 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ccff45a0

Parents:

27856b2f (diff), d816e12 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit 'd816e125fe1fa5c909b706d47904a4d6c1799996'

• commit 'd816e125fe1fa5c909b706d47904a4d6c1799996': dict: const correctness for av_dict_get() and av_dict_copy()

Conflicts:

libavutil/dict.c
libavutil/dict.h

See: e12a73246d8ce7d0fc4036522688934e26de4bb1
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)