aboutsummaryrefslogtreecommitdiffstats
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-24 13:41:49 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-24 13:41:49 +0100
commit595ba3b96258538566d6f42113dd0180aaee87c4 (patch)
treed589db49525821e4a074efeb985dd8a3e6c59c3b /Changelog
parentbd34e26b27e9ec83727dedd1c04c40d8a245cfa8 (diff)
parent25b32586566f285d797737863c97a1c5c9c84e2b (diff)
downloadffmpeg-595ba3b96258538566d6f42113dd0180aaee87c4.tar.gz
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>
Diffstat (limited to 'Changelog')
0 files changed, 0 insertions, 0 deletions