OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aeddc6e a52b5a5)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Oct 2013 12:03:50 +0000 (14:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Oct 2013 12:03:54 +0000 (14:03 +0200)
* qatar/master:
  riff: Add a mapping for VP6A

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

diff --cc libavformat/riff.c
Simple merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help