aboutsummaryrefslogtreecommitdiffstats
path: root/ffprobe.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-11 19:19:15 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-11 19:24:03 +0200
commitc04961fa0ff63a87f07ba411f4f0a413a23ceea8 (patch)
tree6eddb5baceabcc7d9083495ac2fb46c361c7e7ec /ffprobe.c
parentd2417061ef50dbe606692fa24031e3d68cc6292b (diff)
parentb9dea23766f52b8e059e72d34980bb7b456efe8f (diff)
downloadffmpeg-c04961fa0ff63a87f07ba411f4f0a413a23ceea8.tar.gz
Merge commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f'
* commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f': resample: fix avresample_get_delay() return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffprobe.c')
0 files changed, 0 insertions, 0 deletions