diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:52:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:52:08 +0200 |
| commit | bbdef61850205f5af1a0a292fb7166c92726e93b (patch) | |
| tree | 773bda2397cb13a4586d311615986ad6ca919d8a /libavformat/soxdec.c | |
| parent | 84f77f84234e409271852692e736900ee7b2f0fe (diff) | |
| parent | 508998f7d5cc61c7ac7b049813b47adc24c6e282 (diff) | |
| download | ffmpeg-bbdef61850205f5af1a0a292fb7166c92726e93b.tar.gz | |
Merge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282'
* commit '508998f7d5cc61c7ac7b049813b47adc24c6e282':
avf: move riff tags accessors where they belong
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/soxdec.c')
0 files changed, 0 insertions, 0 deletions