Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 19:53:09 +0000 (21:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 19:53:09 +0000 (21:53 +0200)
commitfd3388d63d8e379c484d69f4b32a0becbebad78b
tree9ba6c8675beaf649bc208d5eaf545149fb97cb9c
parent839688bc63e1581dd82e8e51b7fb0c982a483876
parent18fb38fb9ea7e2d5997c096fccfcd4cb43f70294
Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'

* commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294':
  mov: Remove a variable that is set but never used

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mov.c