diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-01 01:47:51 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-01 01:47:51 +0200 |
commit | d57a9928eac1fdc908954eb89dc3d2783e4d1996 (patch) | |
tree | 45f82446b99fcaf42063705625f169e2d00010ba /ffmpeg.c | |
parent | d1dad7c824c14939a0e18fa262f3e51957de6e3e (diff) | |
download | ffmpeg-d57a9928eac1fdc908954eb89dc3d2783e4d1996.tar.gz |
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.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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; |