diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-29 10:46:39 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-29 10:56:36 +0100 |
commit | 8ed9d34aa7f0002d46fa78bbda58a816edaf1169 (patch) | |
tree | 872d2d4581b0ebb1b99979f9a79a66c682b55f78 /libavcodec/yop.c | |
parent | 24cfe91a220204e56394c85bca51799b77df175b (diff) | |
parent | c3d015775388882b8a122afc337ea35108f652be (diff) | |
download | ffmpeg-8ed9d34aa7f0002d46fa78bbda58a816edaf1169.tar.gz |
Merge commit 'c3d015775388882b8a122afc337ea35108f652be'
* commit 'c3d015775388882b8a122afc337ea35108f652be':
flvdec: use the correct audio codec id when parsing metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/yop.c')
0 files changed, 0 insertions, 0 deletions