diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 21:08:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 21:09:43 +0100 |
| commit | 07ca090e814e3f93680fdef555f3688822a0cdbd (patch) | |
| tree | 2122164ce4e0f81e613ce48838de4bea261ef43d /libavcodec/cinepakenc.c | |
| parent | de732a82b618680743375cad4bd88668ee871abd (diff) | |
| parent | 4326bc364b58e97fc3d89417054a6b7610179a00 (diff) | |
| download | ffmpeg-07ca090e814e3f93680fdef555f3688822a0cdbd.tar.gz | |
Merge commit '4326bc364b58e97fc3d89417054a6b7610179a00'
* commit '4326bc364b58e97fc3d89417054a6b7610179a00':
lavf: Do not list mov-only codecs in riff tags
Conflicts:
libavformat/Makefile
libavformat/avidec.c
See: 2e0b5f5c90a4bc1440703ba5e8bf7139ff42f367
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cinepakenc.c')
0 files changed, 0 insertions, 0 deletions