diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2013-07-23 10:37:33 +0200 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2013-07-23 10:37:33 +0200 |
| commit | ff776b88d7a0e2f1386330c65d7f06890ef95a16 (patch) | |
| tree | 31fbfb9221a56ae761c935c06aa3835ef8395fc3 | |
| parent | e2a52bf1bef27823ec0dc2c22eb7e160f76804cf (diff) | |
| parent | 8ea48d256b160d4008f8912abbdffdccdc884256 (diff) | |
Merge branch 'master' into upstream-1.0
| -rw-r--r-- | recipes/gst-plugins-bad-1.0-static.recipe | 1 | ||||
| -rw-r--r-- | recipes/gst-plugins-bad-1.0.recipe | 1 | ||||
| -rw-r--r-- | recipes/gst-plugins-bad-static.recipe | 1 | ||||
| -rw-r--r-- | recipes/gst-plugins-bad.recipe | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/recipes/gst-plugins-bad-1.0-static.recipe b/recipes/gst-plugins-bad-1.0-static.recipe index 5f44aea0..25bfb13f 100644 --- a/recipes/gst-plugins-bad-1.0-static.recipe +++ b/recipes/gst-plugins-bad-1.0-static.recipe @@ -46,6 +46,7 @@ class Recipe(custom.GStreamerStatic): 'libgstsubenc', 'libgstvideoparsersbad', 'libgsty4mdec', + 'libgstjpegformat', ] platform_files_plugins_codecs_devel = { diff --git a/recipes/gst-plugins-bad-1.0.recipe b/recipes/gst-plugins-bad-1.0.recipe index 203977d2..2642831c 100644 --- a/recipes/gst-plugins-bad-1.0.recipe +++ b/recipes/gst-plugins-bad-1.0.recipe @@ -48,6 +48,7 @@ class Recipe(recipe.Recipe): 'lib/gstreamer-1.0/libgstsubenc%(mext)s', 'lib/gstreamer-1.0/libgstvideoparsersbad%(mext)s', 'lib/gstreamer-1.0/libgsty4mdec%(mext)s', + 'lib/gstreamer-1.0/libgstjpegformat%(mext)s', '%(sdir)s/libgstcodecparsers-1.0%(sext)s', ] diff --git a/recipes/gst-plugins-bad-static.recipe b/recipes/gst-plugins-bad-static.recipe index d7a6ab1b..caea9d16 100644 --- a/recipes/gst-plugins-bad-static.recipe +++ b/recipes/gst-plugins-bad-static.recipe @@ -67,6 +67,7 @@ class Recipe(custom.GStreamerStatic): 'libgstvmnc', 'libgstvp8', 'libgsty4mdec', + 'libgstjpegformat', ] platform_files_plugins_codecs_devel = { diff --git a/recipes/gst-plugins-bad.recipe b/recipes/gst-plugins-bad.recipe index b0f12048..6ac221f0 100644 --- a/recipes/gst-plugins-bad.recipe +++ b/recipes/gst-plugins-bad.recipe @@ -70,6 +70,7 @@ class Recipe(recipe.Recipe): 'lib/gstreamer-0.10/libgstvmnc%(mext)s', 'lib/gstreamer-0.10/libgstvp8%(mext)s', 'lib/gstreamer-0.10/libgsty4mdec%(mext)s', + 'lib/gstreamer-0.10/libgstjpegformat%(mext)s', '%(sdir)s/libgstcodecparsers-0.10%(sext)s', 'lib/libgstcodecparsers-0.10.la', 'lib/libgstcodecparsers-0.10.a', |