diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 12:43:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 12:43:55 +0100 |
| commit | bb7be3b763d37c1e869431a76da7a8a2ddf1d9f9 (patch) | |
| tree | 572112bf0e75ba083b8a777c379b74abfb25b031 /libavformat/m4vdec.c | |
| parent | c88ae843da4a9589a6ef1138fb9d9aaa28add2d3 (diff) | |
| parent | 4d0cd5f58c892276716f46f4b2702915e5018215 (diff) | |
| download | ffmpeg-bb7be3b763d37c1e869431a76da7a8a2ddf1d9f9.tar.gz | |
Merge commit '4d0cd5f58c892276716f46f4b2702915e5018215'
* commit '4d0cd5f58c892276716f46f4b2702915e5018215':
flvenc: move metadata updates into a single function
Conflicts:
libavformat/flvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/m4vdec.c')
0 files changed, 0 insertions, 0 deletions