diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 11:50:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 11:51:13 +0100 |
| commit | 405ceb181236b0c7b4558dbefac8869c93df5965 (patch) | |
| tree | b68e99e62e1f4541969706b56e281aa94f15e1b4 /ffplay.c | |
| parent | ab71be091206a2264f3a8862215fc284bb8e6274 (diff) | |
| parent | 454959a5aa73b585e2937b948178310c74bfc297 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacdec: Set the profile during decoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions