diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 14:12:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 15:09:58 +0100 |
| commit | efc4439c894be9f45ec472ad2471143f94abc399 (patch) | |
| tree | eb5aecf2581cbbf83f6d8cc8a4fa2054a83c0c82 /libavcodec/aac_parser.c | |
| parent | 8cc581fbf77ac25deb9eb9398cf4c759857aaeaa (diff) | |
| parent | 973dc4e8d4ae0def273c33bac354ddc6d8e0c470 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
put_bits: Remove unused includes
Conflicts:
libavcodec/put_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aac_parser.c')
0 files changed, 0 insertions, 0 deletions