diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-26 13:14:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-26 13:14:09 +0200 |
| commit | 9748f1477de2c5e5a892da2b80475ca193bd8d2e (patch) | |
| tree | 2e48bfb34520d82faa96d4f9d075268d4a3a6540 /tools/enum_options.c | |
| parent | bc6370b622276c5603d6e32e3939f8b7fb3a4b35 (diff) | |
| parent | ef196beeb50e8e024ed5a560a1d39eff4a296ce4 (diff) | |
| download | ffmpeg-9748f1477de2c5e5a892da2b80475ca193bd8d2e.tar.gz | |
Merge commit 'ef196beeb50e8e024ed5a560a1d39eff4a296ce4'
* commit 'ef196beeb50e8e024ed5a560a1d39eff4a296ce4':
mov: Refactor audio specific parsing in mov_parse_stsd_audio
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/enum_options.c')
0 files changed, 0 insertions, 0 deletions