Re: [FFmpeg-devel] [PATCH] avcodec/h264dec: remove unnecessary checks in h264_decode_frame

2018-09-07 Thread Michael Niedermayer 
On Thu, Sep 06, 2018 at 05:01:49PM +0800, Zhao Zhili wrote:
> These conditions are checked again in is_extra(). This patch makes no
> functional changes.
> ---
>  libavcodec/h264dec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

will apply with patch this depends on

thx

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If you fake or manipulate statistics in a paper in physics you will never
get a job again.
If you fake or manipulate statistics in a paper in medicin you will get
a job for life at the pharma industry.


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] avcodec/h264dec: remove unnecessary checks in h264_decode_frame

2018-09-06 Thread Zhao Zhili 



On 2018年09月06日 17:01, Zhao Zhili wrote:

These conditions are checked again in is_extra(). This patch makes no
functional changes.


I made a mistake. The patch makes no functional changes only after
http://ffmpeg.org/pipermail/ffmpeg-devel/2018-September/233991.html


---
  libavcodec/h264dec.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
index b2447e9..bffce52 100644
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@ -1000,7 +1000,7 @@ static int h264_decode_frame(AVCodecContext *avctx, void 
*data,
   >ps, >is_avc, >nal_length_size,
   avctx->err_recognition, avctx);
  }
-if(h->is_avc && buf_size >= 9 && buf[0]==1 && buf[2]==0 && (buf[4]&0xFC)==0xFC && 
(buf[5]&0x1F) && buf[8]==0x67){
+if (h->is_avc && buf_size >= 9 && buf[0]==1 && buf[2]==0 && 
(buf[4]&0xFC)==0xFC) {
  if (is_extra(buf, buf_size))
  return ff_h264_decode_extradata(buf, buf_size,
  >ps, >is_avc, 
>nal_length_size,


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

[FFmpeg-devel] [PATCH] avcodec/h264dec: remove unnecessary checks in h264_decode_frame

2018-09-06 Thread Zhao Zhili 
These conditions are checked again in is_extra(). This patch makes no
functional changes.
---
 libavcodec/h264dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
index b2447e9..bffce52 100644
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@ -1000,7 +1000,7 @@ static int h264_decode_frame(AVCodecContext *avctx, void 
*data,
  >ps, >is_avc, >nal_length_size,
  avctx->err_recognition, avctx);
 }
-if(h->is_avc && buf_size >= 9 && buf[0]==1 && buf[2]==0 && 
(buf[4]&0xFC)==0xFC && (buf[5]&0x1F) && buf[8]==0x67){
+if (h->is_avc && buf_size >= 9 && buf[0]==1 && buf[2]==0 && 
(buf[4]&0xFC)==0xFC) {
 if (is_extra(buf, buf_size))
 return ff_h264_decode_extradata(buf, buf_size,
 >ps, >is_avc, 
>nal_length_size,
-- 
2.9.5



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

Re: [FFmpeg-devel] [PATCH] avcodec/h264dec: remove unnecessary checks in h264_decode_frame

2018-09-06 Thread Michael Niedermayer 
On Thu, Sep 06, 2018 at 03:38:28PM +0800, Zhao Zhili wrote:
> ---
>  libavcodec/h264dec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

why do you think the checks are unneeded ?

the commit message is not sufficient to understand the reasons for this change
does this fix a bug or ticket ? if so how can the bug be reproduced where is
the ticket?

thx

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Modern terrorism, a quick summary: Need oil, start war with country that
has oil, kill hundread thousand in war. Let country fall into chaos,
be surprised about raise of fundamantalists. Drop more bombs, kill more
people, be surprised about them taking revenge and drop even more bombs
and strip your own citizens of their rights and freedoms. to be continued


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] avcodec/h264dec: remove unnecessary checks in h264_decode_frame

2018-09-06 Thread Zhao Zhili 
---
 libavcodec/h264dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
index b2447e9..bffce52 100644
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@ -1000,7 +1000,7 @@ static int h264_decode_frame(AVCodecContext *avctx, void 
*data,
  >ps, >is_avc, >nal_length_size,
  avctx->err_recognition, avctx);
 }
-if(h->is_avc && buf_size >= 9 && buf[0]==1 && buf[2]==0 && 
(buf[4]&0xFC)==0xFC && (buf[5]&0x1F) && buf[8]==0x67){
+if (h->is_avc && buf_size >= 9 && buf[0]==1 && buf[2]==0 && 
(buf[4]&0xFC)==0xFC) {
 if (is_extra(buf, buf_size))
 return ff_h264_decode_extradata(buf, buf_size,
 >ps, >is_avc, 
>nal_length_size,
-- 
2.9.5



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