diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-21 13:53:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-21 13:56:53 +0100 |
| commit | 6e638677712837eb436c71c650f45313553b47ea (patch) | |
| tree | 79ce643bb36c38785bcbde1b8bb35d5f11456c5a /libavcodec/msmpeg4data.c | |
| parent | 20fa3fb93d0f3d3eab2b1f63a03168f492fae047 (diff) | |
| parent | dc9e05e279cb50387b4a65a9f20db1b15111a6e9 (diff) | |
| download | ffmpeg-6e638677712837eb436c71c650f45313553b47ea.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libvorbis: Give consistent names to all functions, structs, and defines
Conflicts:
libavcodec/libvorbisenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msmpeg4data.c')
0 files changed, 0 insertions, 0 deletions