From 15d0c49e85159b9e27870aff5280c0cd95b103c4 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期四, 04 五月 2017 17:16:56 +0800 Subject: [PATCH] --- VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/merger.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/merger.xml new file mode 100644 index 0000000..2b3a01a --- /dev/null +++ b/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<merger version="3"><dataSet config="main$Generated" generated="true"><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res"/><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\generated\res\rs\debug"/><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\debug\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res"><file name="main" path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\layout\main.xml" qualifiers="" type="layout"/><file name="ic_launcher" path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\mipmap-hdpi\ic_launcher.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\mipmap-mdpi\ic_launcher.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\mipmap-xhdpi\ic_launcher.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\mipmap-xxhdpi\ic_launcher.png" qualifiers="xxhdpi-v4" type="mipmap"/><file path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\res\values\strings.xml" qualifiers=""><string name="addface_native">AddFace</string><string name="source_prompt">Media source</string><string name="source_select">Please select the media source</string><string-array name="source_array"> + <item>clips/testfile.mp4</item> + <item>clips/aa.mp4</item> + <item>clips/cc.mp4</item> + <item>clips/ddd.mp4</item> + <item>rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/main/av_stream</item> + <item>rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream</item> + <item>rtsp://192.168.1.56:8554</item> + </string-array><string name="sink_prompt">Video sink</string><string name="start_java">Start/Pause\nJava MediaPlayer</string><string name="app_name">NativeCodec</string><string name="start_native">Start/Pause</string><string-array name="sink_array"> + <item>Surface</item> + <item>Texture</item> + </string-array><string name="rewind_native">Rewind</string><string name="sink_select">Please select the video sink</string></file></source><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\generated\res\rs\debug"/><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\debug\res"/></dataSet><mergedItems/></merger> \ No newline at end of file -- Gitblit v1.8.0