diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-13 23:02:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-13 23:02:56 +0200 |
| commit | f01a1281ee82c82f64f1879d99cce3807f5fcf05 (patch) | |
| tree | 13b563fd6123d9f8052b54e9311bb9bc8c8f2923 /COPYING.GPLv2 | |
| parent | 313d75cd4300316f6c8de7ef3473275f454e986a (diff) | |
| parent | 019d3fccc4dcf5c8379112f697ce9eb08edee9b9 (diff) | |
| download | ffmpeg-f01a1281ee82c82f64f1879d99cce3807f5fcf05.tar.gz | |
Merge commit '019d3fccc4dcf5c8379112f697ce9eb08edee9b9'
* commit '019d3fccc4dcf5c8379112f697ce9eb08edee9b9':
Set protocol-level metadata in AVFormatContext any time a packet is read.
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv2')
0 files changed, 0 insertions, 0 deletions