diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-11 08:24:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-11 08:24:45 +0100 |
| commit | 9696ad6a76534b16dfaf9872dd20017f9f8d18e4 (patch) | |
| tree | 2d766f16cc4c8db5cfc895f1ef807ed1866084b0 /libavcodec/aacsbr.h | |
| parent | fd3cdcaf5f4d4f21e61491f19742092f855e93ac (diff) | |
| parent | 395c3feb3bb165af5760d287a9a64344b6269fe2 (diff) | |
| download | ffmpeg-9696ad6a76534b16dfaf9872dd20017f9f8d18e4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: fix 'clean' target
ZeroCodec: Flip output
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacsbr.h')
0 files changed, 0 insertions, 0 deletions