diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2015-05-18 16:58:40 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-20 21:41:08 +0100 |
commit | f8232d79aff4fa419c2a0e7ccae38615c9c1157a (patch) | |
tree | 961c014e1a648027e8a53722c0b576fc8181ddeb /meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-ffserver-set-oformat.patch | |
parent | 443d25ace122ac91efc4e7412188623a2df9f120 (diff) | |
download | poky-f8232d79aff4fa419c2a0e7ccae38615c9c1157a.tar.gz |
gstreamer: remove 0.10 recipes
gstreamer 0.10 is still available from meta-openembedded/meta-multimedia
See also
https://bugzilla.yoctoproject.org/show_bug.cgi?id=6294
http://lists.openembedded.org/pipermail/openembedded-core/2015-April/104276.html
(From OE-Core rev: fe44ac167a2a76531af3519f3889fce92024567b)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-ffserver-set-oformat.patch')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-ffserver-set-oformat.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-ffserver-set-oformat.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-ffserver-set-oformat.patch deleted file mode 100644 index 80325db4d6..0000000000 --- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-ffserver-set-oformat.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | gst-ffmpeg: ffserver: set oformat | ||
2 | |||
3 | Fix Ticket1986 | ||
4 | |||
5 | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | ||
6 | (cherry picked from commit cbe43e62c9ac7d4aefdc13476f6f691bd626525f) | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | |||
10 | --- | ||
11 | ffserver.c | 4 +++- | ||
12 | 1 files changed, 3 insertions(+), 1 deletions(-) | ||
13 | |||
14 | diff --git a/ffserver.c b/ffserver.c | ||
15 | index 4044d0f..8740140 100644 | ||
16 | --- a/gst-libs/ext/libav/ffserver.c | ||
17 | +++ b/gst-libs/ext/libav/ffserver.c | ||
18 | @@ -2937,12 +2937,14 @@ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer, | ||
19 | { | ||
20 | AVFormatContext *avc; | ||
21 | AVStream *avs = NULL; | ||
22 | + AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL); | ||
23 | int i; | ||
24 | |||
25 | avc = avformat_alloc_context(); | ||
26 | - if (avc == NULL) { | ||
27 | + if (avc == NULL || !rtp_format) { | ||
28 | return -1; | ||
29 | } | ||
30 | + avc->oformat = rtp_format; | ||
31 | av_dict_set(&avc->metadata, "title", | ||
32 | stream->title[0] ? stream->title : "No Title", 0); | ||
33 | avc->nb_streams = stream->nb_streams; | ||
34 | -- | ||
35 | 1.7.5.4 | ||
36 | |||