aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/vqf.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-03 10:55:43 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-03 10:55:43 +0200
commit1ba4cbf734b343f82e0ae4ab6be3756249771afa (patch)
treeca0ea2cbd00fba018cb3c713c278796ca31a5d2c /libavformat/vqf.c
parent05599308e98895e3c9aa6c1c90a2086aa029c42e (diff)
parent6b753015ca6f93d16a05e1a97da1fa42e4da60ec (diff)
downloadffmpeg-1ba4cbf734b343f82e0ae4ab6be3756249771afa.tar.gz
Merge commit '6b753015ca6f93d16a05e1a97da1fa42e4da60ec'
* commit '6b753015ca6f93d16a05e1a97da1fa42e4da60ec': aac: Remove aacpsy.h header, unused since 78e65cd7726 cavs: Remove cavsdata.h header, unused since 88386feefd Conflicts: libavcodec/aacpsy.h libavcodec/cavsdata.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/vqf.c')
0 files changed, 0 insertions, 0 deletions