diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2014-07-22 03:32:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 05:21:50 +0200 |
| commit | 0f04e2741e26c967d3c6683f89bc8ba286baded3 (patch) | |
| tree | 374d74f0094f81e20e8f6f47bee1078dbd6a0519 | |
| parent | 84642ec8798a813e10590eb553e26d527b57daf8 (diff) | |
| download | ffmpeg-0f04e2741e26c967d3c6683f89bc8ba286baded3.tar.gz | |
libavformat/img2dec.c: Add a long_name to the piped image demuxers
This fixes segfaults in gst-libav1.0 compiled against FFmpeg 2.3.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 135ea609cebb5a5d331a2550caebe161d163c190)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/img2dec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index cda4996568..f97800797e 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -666,6 +666,7 @@ static const AVClass imgname ## _class = {\ };\ AVInputFormat ff_image_ ## imgname ## _pipe_demuxer = {\ .name = AV_STRINGIFY(imgname) "_pipe",\ + .long_name = NULL_IF_CONFIG_SMALL("piped " AV_STRINGIFY(imgname) " sequence"),\ .priv_data_size = sizeof(VideoDemuxData),\ .read_probe = imgname ## _probe,\ .read_header = ff_img_read_header,\ |