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)
commitb07dc81a9e35ddd2b2ac0109ae2e97b86ff4a4a9
treeeaf97664c46d8222fef05af2556746d4d297a26e
parent2ba58bec20b0039ccc40cfba59af6d56de16e8b1
parent86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea
Merge commit '86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea'

* commit '86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea':
  mov: Drop unused parameter from ff_mov_read_esds()

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