]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24cfe91 c3d0157)
Merge commit 'c3d015775388882b8a122afc337ea35108f652be'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Mar 2013 09:46:39 +0000 (10:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Mar 2013 09:56:36 +0000 (10:56 +0100)
* commit 'c3d015775388882b8a122afc337ea35108f652be':
  flvdec: use the correct audio codec id when parsing metadata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/flvdec.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/flvdec.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.