Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-01 03:47:51 +0400
committerMichael Niedermayer <michaelni@gmx.at>2012-08-01 03:47:51 +0400
commitd57a9928eac1fdc908954eb89dc3d2783e4d1996 (patch)
tree45f82446b99fcaf42063705625f169e2d00010ba /ffmpeg.c
parentd1dad7c824c14939a0e18fa262f3e51957de6e3e (diff)
ffmpeg: avoid bogus error with "test.flac -c copy -f null -"
Reported-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index c2ea5bd894..f85d8e01a8 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2343,7 +2343,8 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
opkt.data = pkt->data;
opkt.size = pkt->size;
}
- if (of->ctx->oformat->flags & AVFMT_RAWPICTURE) {
+
+ if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
/* store AVPicture in AVPacket, as expected by the output format */
avpicture_fill(&pict, opkt.data, ost->st->codec->pix_fmt, ost->st->codec->width, ost->st->codec->height);
opkt.data = (uint8_t *)&pict;