diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-25 21:08:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-25 21:33:18 +0200 |
| commit | c9e0f7a080c1eb29e89ea2ba163d6b790ce1ff20 (patch) | |
| tree | 61b90fb7e3815f192aacf77546d4fdba26d1c113 /libavcodec/h261dec.c | |
| parent | 944a744bf58534a00b2996910a5a4ac10c260169 (diff) | |
| parent | 99e22b7859177f6d3ed6121040924b337dce5497 (diff) | |
| download | ffmpeg-c9e0f7a080c1eb29e89ea2ba163d6b790ce1ff20.tar.gz | |
Merge commit '99e22b7859177f6d3ed6121040924b337dce5497'
* commit '99e22b7859177f6d3ed6121040924b337dce5497':
mov: Emit the correct tags for clcp tracks
Conflicts:
libavformat/movenc.c
See: a5f6720f13c7678c61be1413debf3e11e678781c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h261dec.c')
0 files changed, 0 insertions, 0 deletions