diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 12:40:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 12:41:08 +0200 |
| commit | 51286aaffcad24c1ee134bbcea5202e7e5950cc8 (patch) | |
| tree | 6e03a0ede6c6285de9eccb86faabedb258534ba7 /libavformat/smjpegenc.c | |
| parent | 05deb05fe9ce28cc7b9951446edfaabc364b0b88 (diff) | |
| parent | 516089d5d86b6809a9458f9cf171f2bc9a8e2a25 (diff) | |
| download | ffmpeg-51286aaffcad24c1ee134bbcea5202e7e5950cc8.tar.gz | |
Merge commit '516089d5d86b6809a9458f9cf171f2bc9a8e2a25'
* commit '516089d5d86b6809a9458f9cf171f2bc9a8e2a25':
riff: Add ACTRAC3+ guid
No change, this commit was in ffmpeg already with this formating
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/smjpegenc.c')
0 files changed, 0 insertions, 0 deletions