diff mbox

[FFmpeg-devel] mpeg4videodec: Fix unused variable warning

Message ID 9bd1d161-ad4e-1f7a-9a62-6cca0d503ff6@jkqxz.net
State Accepted
Commit e6a1dfc9ce81a443b16776a5fbd841284efa3613
Headers show

Commit Message

Mark Thompson Dec. 21, 2017, 7:54 p.m. UTC 
video_format is not used.
---
Introduced by 4b2a186ef02c1fbe7f7cae30a2bdfff72bcc75f7:

src/libavcodec/mpeg4videodec.c: In function ‘mpeg4_decode_visual_object’:
src/libavcodec/mpeg4videodec.c:1771:17: warning: unused variable ‘video_format’ [-Wunused-variable]
             int video_format = get_bits(gb, 3);
                 ^~~~~~~~~~~~

 libavcodec/mpeg4videodec.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Michael Niedermayer Dec. 23, 2017, 11:57 p.m. UTC | #1 
On Thu, Dec 21, 2017 at 07:54:56PM +0000, Mark Thompson wrote:
> video_format is not used.
> ---
> Introduced by 4b2a186ef02c1fbe7f7cae30a2bdfff72bcc75f7:
> 
> src/libavcodec/mpeg4videodec.c: In function ‘mpeg4_decode_visual_object’:
> src/libavcodec/mpeg4videodec.c:1771:17: warning: unused variable ‘video_format’ [-Wunused-variable]
>              int video_format = get_bits(gb, 3);
>                  ^~~~~~~~~~~~
> 
>  libavcodec/mpeg4videodec.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

LGTM

thx

[...]
Mark Thompson Dec. 26, 2017, 5:34 p.m. UTC | #2 
On 23/12/17 23:57, Michael Niedermayer wrote:
> On Thu, Dec 21, 2017 at 07:54:56PM +0000, Mark Thompson wrote:
>> video_format is not used.
>> ---
>> Introduced by 4b2a186ef02c1fbe7f7cae30a2bdfff72bcc75f7:
>>
>> src/libavcodec/mpeg4videodec.c: In function ‘mpeg4_decode_visual_object’:
>> src/libavcodec/mpeg4videodec.c:1771:17: warning: unused variable ‘video_format’ [-Wunused-variable]
>>              int video_format = get_bits(gb, 3);
>>                  ^~~~~~~~~~~~
>>
>>  libavcodec/mpeg4videodec.c | 7 ++++---
>>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> LGTM

Applied.

Thanks,

- Mark
diff mbox

Patch

diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index e9cba25dd0..12755b5e8a 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -1768,9 +1768,10 @@  static int mpeg4_decode_visual_object(MpegEncContext *s, GetBitContext *gb)
         visual_object_type == VOT_STILL_TEXTURE_ID) {
         int video_signal_type = get_bits1(gb);
         if (video_signal_type) {
-            int video_format = get_bits(gb, 3);
-            int video_range = get_bits1(gb);
-            int color_description = get_bits1(gb);
+            int video_range, color_description;
+            skip_bits(gb, 3); // video_format
+            video_range = get_bits1(gb);
+            color_description = get_bits1(gb);
 
             s->avctx->color_range = video_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;