[vlc-commits] demux: mp4: fix shadowed var

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Mar 14 17:44:07 2018 +0100| [02214f5ea7f3821b7822ad2e81d39883be5d6063] | committer: Francois Cartegnie

demux: mp4: fix shadowed var

(cherry picked from commit e67f4335c1a2639c3928ce86eb298055ee5c11c5)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=02214f5ea7f3821b7822ad2e81d39883be5d6063
---

 modules/demux/mp4/essetup.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/modules/demux/mp4/essetup.c b/modules/demux/mp4/essetup.c
index 30076dc3b3..8a54fa1d0d 100644
--- a/modules/demux/mp4/essetup.c
+++ b/modules/demux/mp4/essetup.c
@@ -767,15 +767,12 @@ int SetupVideoES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
         case VLC_FOURCC( 'a', 'i', '1', '5' ):
         case VLC_FOURCC( 'a', 'i', '1', '6' ):
         {
-            if( !p_track->fmt.i_extra && p_track->fmt.video.i_width < UINT16_MAX )
+            if( !p_track->fmt.i_extra && p_track->fmt.video.i_width < UINT16_MAX &&
+                p_fiel && BOXDATA(p_fiel) )
             {
-                const MP4_Box_t *p_fiel = MP4_BoxGet( p_sample, "fiel" );
-                if( p_fiel && BOXDATA(p_fiel) )
-                {
-                    p_track->fmt.p_extra =
-                            AVCi_create_AnnexB( p_track->fmt.video.i_width,
-                                              !!BOXDATA(p_fiel)->i_flags, &p_track->fmt.i_extra );
-                }
+                p_track->fmt.p_extra =
+                        AVCi_create_AnnexB( p_track->fmt.video.i_width,
+                                            !!BOXDATA(p_fiel)->i_flags, &p_track->fmt.i_extra );
             }
             break;
         }