Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 12:41:49 +0000 (13:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 12:41:49 +0000 (13:41 +0100)
commit595ba3b96258538566d6f42113dd0180aaee87c4
treed589db49525821e4a074efeb985dd8a3e6c59c3b
parentbd34e26b27e9ec83727dedd1c04c40d8a245cfa8
parent25b32586566f285d797737863c97a1c5c9c84e2b
Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'

* commit '25b32586566f285d797737863c97a1c5c9c84e2b':
  lavf: add an AVStream field for exporting stream-global side data

Conflicts:
libavformat/utils.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavformat/avformat.h
libavformat/utils.c
libavformat/version.h