aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/ilbc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-22 02:40:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-22 02:40:00 +0200
commit7f1543d46cd88e86bd662695d79c16c93892223e (patch)
tree8e43cb545773b309b507afaaee1aeed8348dfd1d /libavformat/ilbc.c
parentc7168d1a22a67d908a556c2e1a4131932006fa22 (diff)
parentb396bbad100a7493691d09b8dceba91e3cd28e2e (diff)
downloadffmpeg-7f1543d46cd88e86bd662695d79c16c93892223e.tar.gz
Merge commit 'b396bbad100a7493691d09b8dceba91e3cd28e2e'
* commit 'b396bbad100a7493691d09b8dceba91e3cd28e2e': configure: Do not add extralibs to avresample .pc file Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ilbc.c')
0 files changed, 0 insertions, 0 deletions