aboutsummaryrefslogtreecommitdiffstats
path: root/ffprobe.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-26 02:47:53 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-26 02:58:08 +0200
commit7e19c549bafa9e4025d0adc59593f6541ccbe304 (patch)
tree2399ce6d837cb3aa22060d1bc839ed82c7a5a5f3 /ffprobe.c
parent8c508a0354283867984f8bbb3a013b296de67f6b (diff)
parent4e326ec76991667c3cb0130c423e9818ad7f2a20 (diff)
downloadffmpeg-7e19c549bafa9e4025d0adc59593f6541ccbe304.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: fate: aac: Add test for AAC-ELD Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffprobe.c')
0 files changed, 0 insertions, 0 deletions