diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-22 23:59:57 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-23 00:00:03 +0200 |
commit | d486a6eae9a2dbbbfdad43f598a44831cd259952 (patch) | |
tree | 5f27c87dc61b043d281c32494dabbda6c18abf4e /libavcodec/g723_1_data.h | |
parent | 88beb2df982aa4de257f742ff41f777927cc5173 (diff) | |
parent | 5ab855777de94ba616a9c42fbd0f2947f95deb89 (diff) | |
download | ffmpeg-d486a6eae9a2dbbbfdad43f598a44831cd259952.tar.gz |
Merge remote-tracking branch 'dwbuiten/master'
* dwbuiten/master:
wav: Add check for 'fmt' tag in SMV code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g723_1_data.h')
0 files changed, 0 insertions, 0 deletions