[FFmpeg-cvslog] avcodec/h264_slice: Use AVFrame diemensions for grayscale handling

2015-06-10 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed Jun 10 
11:37:48 2015 +0200| [aef0e0f009802f1a5e21eb6465498632071e4475] | committer: 
Michael Niedermayer

avcodec/h264_slice: Use AVFrame diemensions for grayscale handling

The AVFrame values are closer to the AVFrame bitmap changed instead of
the AVCodecContext values, so this should be more robust

Signed-off-by: Michael Niedermayer 

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

 libavcodec/h264_slice.c |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index f12e4b7..9c4d613 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -251,11 +251,11 @@ static int alloc_picture(H264Context *h, H264Picture *pic)
 av_pix_fmt_get_chroma_sub_sample(pic->f->format,
  &h_chroma_shift, &v_chroma_shift);
 
-for(i=0; iavctx->height, v_chroma_shift); i++) {
+for(i=0; if->height, v_chroma_shift); i++) {
 memset(pic->f->data[1] + pic->f->linesize[1]*i,
-   0x80, FF_CEIL_RSHIFT(h->avctx->width, h_chroma_shift));
+   0x80, FF_CEIL_RSHIFT(pic->f->width, h_chroma_shift));
 memset(pic->f->data[2] + pic->f->linesize[2]*i,
-   0x80, FF_CEIL_RSHIFT(h->avctx->width, h_chroma_shift));
+   0x80, FF_CEIL_RSHIFT(pic->f->width, h_chroma_shift));
 }
 }
 

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

[FFmpeg-cvslog] avcodec/h264_slice: Use AVFrame diemensions for grayscale handling

2015-06-12 Thread Michael Niedermayer 
ffmpeg | branch: release/2.7 | Michael Niedermayer  | Wed Jun 
10 11:37:48 2015 +0200| [5a0862af55298259c4528645695c8348c830be38] | committer: 
Michael Niedermayer

avcodec/h264_slice: Use AVFrame diemensions for grayscale handling

The AVFrame values are closer to the AVFrame bitmap changed instead of
the AVCodecContext values, so this should be more robust

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

Signed-off-by: Michael Niedermayer 

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

 libavcodec/h264_slice.c |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index f12e4b7..9c4d613 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -251,11 +251,11 @@ static int alloc_picture(H264Context *h, H264Picture *pic)
 av_pix_fmt_get_chroma_sub_sample(pic->f->format,
  &h_chroma_shift, &v_chroma_shift);
 
-for(i=0; iavctx->height, v_chroma_shift); i++) {
+for(i=0; if->height, v_chroma_shift); i++) {
 memset(pic->f->data[1] + pic->f->linesize[1]*i,
-   0x80, FF_CEIL_RSHIFT(h->avctx->width, h_chroma_shift));
+   0x80, FF_CEIL_RSHIFT(pic->f->width, h_chroma_shift));
 memset(pic->f->data[2] + pic->f->linesize[2]*i,
-   0x80, FF_CEIL_RSHIFT(h->avctx->width, h_chroma_shift));
+   0x80, FF_CEIL_RSHIFT(pic->f->width, h_chroma_shift));
 }
 }
 

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

[FFmpeg-cvslog] avcodec/h264_slice: Use AVFrame diemensions for grayscale handling

2015-07-20 Thread Michael Niedermayer 
ffmpeg | branch: release/2.6 | Michael Niedermayer  | Wed Jun 
10 11:37:48 2015 +0200| [0afa8a6c859bbcaf38a347647d3945054d76be1f] | committer: 
Michael Niedermayer

avcodec/h264_slice: Use AVFrame diemensions for grayscale handling

The AVFrame values are closer to the AVFrame bitmap changed instead of
the AVCodecContext values, so this should be more robust

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

Conflicts:

libavcodec/h264_slice.c

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

 libavcodec/h264_slice.c |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index b3fdc99..c467da3 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -242,11 +242,11 @@ static int alloc_picture(H264Context *h, H264Picture *pic)
 av_pix_fmt_get_chroma_sub_sample(pic->f.format,
  &h_chroma_shift, &v_chroma_shift);
 
-for(i=0; iavctx->height, v_chroma_shift); i++) {
+for(i=0; if.height, v_chroma_shift); i++) {
 memset(pic->f.data[1] + pic->f.linesize[1]*i,
-   0x80, FF_CEIL_RSHIFT(h->avctx->width, h_chroma_shift));
+   0x80, FF_CEIL_RSHIFT(pic->f.width, h_chroma_shift));
 memset(pic->f.data[2] + pic->f.linesize[2]*i,
-   0x80, FF_CEIL_RSHIFT(h->avctx->width, h_chroma_shift));
+   0x80, FF_CEIL_RSHIFT(pic->f.width, h_chroma_shift));
 }
 }
 

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

[FFmpeg-cvslog] avcodec/h264_slice: Use AVFrame diemensions for grayscale handling

2015-07-27 Thread Michael Niedermayer 
ffmpeg | branch: release/2.5 | Michael Niedermayer  | Wed Jun 
10 11:37:48 2015 +0200| [f5a73058b0f26133bb366f8644711563db76fb74] | committer: 
Michael Niedermayer

avcodec/h264_slice: Use AVFrame diemensions for grayscale handling

The AVFrame values are closer to the AVFrame bitmap changed instead of
the AVCodecContext values, so this should be more robust

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

Conflicts:

libavcodec/h264_slice.c

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

 libavcodec/h264_slice.c |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 6b1db1a..d439f9b 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -278,11 +278,11 @@ static int alloc_picture(H264Context *h, H264Picture *pic)
 av_pix_fmt_get_chroma_sub_sample(pic->f.format,
  &h_chroma_shift, &v_chroma_shift);
 
-for(i=0; iavctx->height, v_chroma_shift); i++) {
+for(i=0; if.height, v_chroma_shift); i++) {
 memset(pic->f.data[1] + pic->f.linesize[1]*i,
-   0x80, FF_CEIL_RSHIFT(h->avctx->width, h_chroma_shift));
+   0x80, FF_CEIL_RSHIFT(pic->f.width, h_chroma_shift));
 memset(pic->f.data[2] + pic->f.linesize[2]*i,
-   0x80, FF_CEIL_RSHIFT(h->avctx->width, h_chroma_shift));
+   0x80, FF_CEIL_RSHIFT(pic->f.width, h_chroma_shift));
 }
 }
 

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

[FFmpeg-cvslog] avcodec/h264_slice: Use AVFrame diemensions for grayscale handling

2015-08-20 Thread Michael Niedermayer 
ffmpeg | branch: release/2.4 | Michael Niedermayer  | Wed Jun 
10 11:37:48 2015 +0200| [6ff5c4cd49ec33472cd132dc57ae53e1f1d396d0] | committer: 
Michael Niedermayer

avcodec/h264_slice: Use AVFrame diemensions for grayscale handling

The AVFrame values are closer to the AVFrame bitmap changed instead of
the AVCodecContext values, so this should be more robust

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

Conflicts:

libavcodec/h264_slice.c

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

 libavcodec/h264_slice.c |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 8f8660d..d63e614 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -278,11 +278,11 @@ static int alloc_picture(H264Context *h, H264Picture *pic)
 av_pix_fmt_get_chroma_sub_sample(pic->f.format,
  &h_chroma_shift, &v_chroma_shift);
 
-for(i=0; iavctx->height, v_chroma_shift); i++) {
+for(i=0; if.height, v_chroma_shift); i++) {
 memset(pic->f.data[1] + pic->f.linesize[1]*i,
-   0x80, FF_CEIL_RSHIFT(h->avctx->width, h_chroma_shift));
+   0x80, FF_CEIL_RSHIFT(pic->f.width, h_chroma_shift));
 memset(pic->f.data[2] + pic->f.linesize[2]*i,
-   0x80, FF_CEIL_RSHIFT(h->avctx->width, h_chroma_shift));
+   0x80, FF_CEIL_RSHIFT(pic->f.width, h_chroma_shift));
 }
 }
 

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