OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47cc616 eddff16)
Merge commit 'eddff165b4cdc1f064245a4bad6f4265581c12b1'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Dec 2013 17:08:37 +0000 (18:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Dec 2013 17:08:50 +0000 (18:08 +0100)
* commit 'eddff165b4cdc1f064245a4bad6f4265581c12b1':
  fate: add utility function to test parser, demuxer, and decoder

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

diff --cc tests/Makefile
Simple merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help