diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 02:32:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 02:44:56 +0200 |
| commit | 1946ad4d8c089fcdd8aa82b0cd25e52d4443c1b7 (patch) | |
| tree | c85c940679c32e11867deaf289b8fc4985522a35 /libavcodec/sbrdsp.c | |
| parent | 069e462bebdea61d57e73099e218e38a78862a5a (diff) | |
| parent | 121b5b7e0476d22408d748b914799b7c00acc3a4 (diff) | |
| download | ffmpeg-1946ad4d8c089fcdd8aa82b0cd25e52d4443c1b7.tar.gz | |
Merge commit '121b5b7e0476d22408d748b914799b7c00acc3a4'
* commit '121b5b7e0476d22408d748b914799b7c00acc3a4':
isom: add some BOXX tags
isom: add 'flic' tag
isom: add 'm1v ' tag
Conflicts:
libavformat/isom.c
See: ca8623e1a537fa48366efebdf235442f1197bb71
See: 8a3f976498cc096644b95ade7240a73e17d3a042
See: fca62f05005567514b5daaea230ba9365e202201
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sbrdsp.c')
0 files changed, 0 insertions, 0 deletions