Skip to content
This repository has been archived by the owner on Apr 29, 2020. It is now read-only.

Commit

Permalink
updated README
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinMReed committed Sep 8, 2012
1 parent 7926b8c commit 19914df
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions README.md
Expand Up @@ -47,19 +47,19 @@ Visit the website at: [http://ffmpeg.org](http://ffmpeg.org)
}

INCLUDEPATH += ../ffmpeg/include
LIBS += -lcamapi -L../ffmpeg/lib/{gpl|lgpl}/$${ARCH} -lavformat -lavcodec -lavutil
LIBS += -lcamapi -L../ffmpeg/lib/{gpl|lgpl}/qnx/$${ARCH} -lavformat -lavcodec -lavutil

## Including FFmpeg in the BAR

<!-- include libs for armle-v7 -->
<asset path="ffmpeg/lib/{gpl|lgpl}/armle-v7/libavcodec.so.54">lib/libavcodec.so.54</asset>
<asset path="ffmpeg/lib/{gpl|lgpl}/armle-v7/libavformat.so.54">lib/libavformat.so.54</asset>
<asset path="ffmpeg/lib/{gpl|lgpl}/armle-v7/libavutil.so.51">lib/libavutil.so.51</asset>
<asset path="ffmpeg/lib/{gpl|lgpl}/qnx/armle-v7/libavcodec.so.54">lib/libavcodec.so.54</asset>
<asset path="ffmpeg/lib/{gpl|lgpl}/qnx/armle-v7/libavformat.so.54">lib/libavformat.so.54</asset>
<asset path="ffmpeg/lib/{gpl|lgpl}/qnx/armle-v7/libavutil.so.51">lib/libavutil.so.51</asset>

<!-- include libs for x86 -->
<asset path="ffmpeg/lib/{gpl|lgpl}/x86/libavcodec.a">lib/libavcodec.a</asset>
<asset path="ffmpeg/lib/{gpl|lgpl}/x86/libavformat.a">lib/libavformat.a</asset>
<asset path="ffmpeg/lib/{gpl|lgpl}/x86/libavutil.a">lib/libavutil.a</asset>
<asset path="ffmpeg/lib/{gpl|lgpl}/qnx/x86/libavcodec.a">lib/libavcodec.a</asset>
<asset path="ffmpeg/lib/{gpl|lgpl}/qnx/x86/libavformat.a">lib/libavformat.a</asset>
<asset path="ffmpeg/lib/{gpl|lgpl}/qnx/x86/libavutil.a">lib/libavutil.a</asset>

# H.264 Optional Support

Expand Down Expand Up @@ -94,4 +94,4 @@ Visit the website at: [http://www.videolan.org](http://www.videolan.org/develope

# License

While FFmpeg is either LGPL-v2.1 or GPL depending on how it is built, libffbb uses Apache License, Version 2.0.
While FFmpeg is either LGPL or GPL depending on how it is built, libffbb uses Apache License, Version 2.0.

0 comments on commit 19914df

Please sign in to comment.