[FFmpeg-cvslog] ffmpeg: Check for RAWVIDEO and do not relay only on AVFMT_RAWPICTURE

2015-11-11 Thread Michael Niedermayer 
ffmpeg | branch: release/2.7 | Michael Niedermayer  | 
Fri Aug 21 02:16:31 2015 +0200| [ce17111ed18dda4193114137c104450e266545e1] | 
committer: Michael Niedermayer

ffmpeg: Check for RAWVIDEO and do not relay only on AVFMT_RAWPICTURE

The null muxer has AVFMT_RAWPICTURE set but can be fed with non-raw material

related to Ticket4778

Signed-off-by: Michael Niedermayer 
(cherry picked from commit c8890941d63df786bb7a8cab92677416499bb7c3)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ce17111ed18dda4193114137c104450e266545e1
---

 ffmpeg.c |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 81751cd..c99a014 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1821,7 +1821,9 @@ static void do_streamcopy(InputStream *ist, OutputStream 
*ost, const AVPacket *p
 }
 av_copy_packet_side_data(&opkt, pkt);
 
-if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && 
(of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
+if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
+ost->st->codec->codec_id == AV_CODEC_ID_RAWVIDEO &&
+(of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
 /* store AVPicture in AVPacket, as expected by the output format */
 int ret = avpicture_fill(&pict, opkt.data, ost->st->codec->pix_fmt, 
ost->st->codec->width, ost->st->codec->height);
 if (ret < 0) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] ffmpeg: Check for RAWVIDEO and do not relay only on AVFMT_RAWPICTURE

2015-11-19 Thread Michael Niedermayer 
ffmpeg | branch: release/2.6 | Michael Niedermayer  | 
Fri Aug 21 02:16:31 2015 +0200| [74ce026e684fbc4e7ff68f27ff03dabaa400349b] | 
committer: Michael Niedermayer

ffmpeg: Check for RAWVIDEO and do not relay only on AVFMT_RAWPICTURE

The null muxer has AVFMT_RAWPICTURE set but can be fed with non-raw material

related to Ticket4778

Signed-off-by: Michael Niedermayer 
(cherry picked from commit c8890941d63df786bb7a8cab92677416499bb7c3)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=74ce026e684fbc4e7ff68f27ff03dabaa400349b
---

 ffmpeg.c |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 5a0c66c..f09b3f5 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1788,7 +1788,9 @@ static void do_streamcopy(InputStream *ist, OutputStream 
*ost, const AVPacket *p
 }
 av_copy_packet_side_data(&opkt, pkt);
 
-if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && 
(of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
+if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
+ost->st->codec->codec_id == AV_CODEC_ID_RAWVIDEO &&
+(of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
 /* store AVPicture in AVPacket, as expected by the output format */
 int ret = avpicture_fill(&pict, opkt.data, ost->st->codec->pix_fmt, 
ost->st->codec->width, ost->st->codec->height);
 if (ret < 0) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] ffmpeg: Check for RAWVIDEO and do not relay only on AVFMT_RAWPICTURE

2015-11-26 Thread Michael Niedermayer 
ffmpeg | branch: release/2.5 | Michael Niedermayer  | 
Fri Aug 21 02:16:31 2015 +0200| [5ab1f188534aaf44a43ccebccf0ffacd914beef5] | 
committer: Michael Niedermayer

ffmpeg: Check for RAWVIDEO and do not relay only on AVFMT_RAWPICTURE

The null muxer has AVFMT_RAWPICTURE set but can be fed with non-raw material

related to Ticket4778

Signed-off-by: Michael Niedermayer 
(cherry picked from commit c8890941d63df786bb7a8cab92677416499bb7c3)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ab1f188534aaf44a43ccebccf0ffacd914beef5
---

 ffmpeg.c |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 343728b..751483f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1757,7 +1757,9 @@ static void do_streamcopy(InputStream *ist, OutputStream 
*ost, const AVPacket *p
 }
 av_copy_packet_side_data(&opkt, pkt);
 
-if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && 
(of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
+if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
+ost->st->codec->codec_id == AV_CODEC_ID_RAWVIDEO &&
+(of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
 /* store AVPicture in AVPacket, as expected by the output format */
 int ret = avpicture_fill(&pict, opkt.data, ost->st->codec->pix_fmt, 
ost->st->codec->width, ost->st->codec->height);
 if (ret < 0) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] ffmpeg: Check for RAWVIDEO and do not relay only on AVFMT_RAWPICTURE

2015-08-20 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Fri 
Aug 21 02:16:31 2015 +0200| [c8890941d63df786bb7a8cab92677416499bb7c3] | 
committer: Michael Niedermayer

ffmpeg: Check for RAWVIDEO and do not relay only on AVFMT_RAWPICTURE

The null muxer has AVFMT_RAWPICTURE set but can be fed with non-raw material

related to Ticket4778

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8890941d63df786bb7a8cab92677416499bb7c3
---

 ffmpeg.c |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 4bd5f60..530b3aa 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1880,7 +1880,9 @@ static void do_streamcopy(InputStream *ist, OutputStream 
*ost, const AVPacket *p
 }
 av_copy_packet_side_data(&opkt, pkt);
 
-if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && 
(of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
+if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
+ost->st->codec->codec_id == AV_CODEC_ID_RAWVIDEO &&
+(of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
 /* store AVPicture in AVPacket, as expected by the output format */
 int ret = avpicture_fill(&pict, opkt.data, ost->st->codec->pix_fmt, 
ost->st->codec->width, ost->st->codec->height);
 if (ret < 0) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] ffmpeg: Check for RAWVIDEO and do not relay only on AVFMT_RAWPICTURE

2015-08-24 Thread Michael Niedermayer 
ffmpeg | branch: release/2.4 | Michael Niedermayer  | 
Fri Aug 21 02:16:31 2015 +0200| [1c058d94b9ea7f9cfe418495c74204c6962a6d65] | 
committer: Michael Niedermayer

ffmpeg: Check for RAWVIDEO and do not relay only on AVFMT_RAWPICTURE

The null muxer has AVFMT_RAWPICTURE set but can be fed with non-raw material

related to Ticket4778

Signed-off-by: Michael Niedermayer 
(cherry picked from commit c8890941d63df786bb7a8cab92677416499bb7c3)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c058d94b9ea7f9cfe418495c74204c6962a6d65
---

 ffmpeg.c |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 714a45e..db8ada6 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1708,7 +1708,9 @@ static void do_streamcopy(InputStream *ist, OutputStream 
*ost, const AVPacket *p
 }
 av_copy_packet_side_data(&opkt, pkt);
 
-if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && 
(of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
+if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
+ost->st->codec->codec_id == AV_CODEC_ID_RAWVIDEO &&
+(of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
 /* store AVPicture in AVPacket, as expected by the output format */
 int ret = avpicture_fill(&pict, opkt.data, ost->st->codec->pix_fmt, 
ost->st->codec->width, ost->st->codec->height);
 if (ret < 0) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog