Merge commit '86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Aug 2014 16:27:46 +0000 (18:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Aug 2014 16:27:51 +0000 (18:27 +0200)
* commit '86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea':
  mov: Drop unused parameter from ff_mov_read_esds()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/cafdec.c
libavformat/isom.h
libavformat/mov.c

Simple merge
Simple merge
Simple merge