Merge commit '56c2f37727015212a404cae0f444d8bc8704d691'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Jul 2015 09:57:34 +0000 (11:57 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Jul 2015 09:57:34 +0000 (11:57 +0200)
* commit '56c2f37727015212a404cae0f444d8bc8704d691':
  avconv: drop update_sample_fmt()

Conflicts:
ffmpeg.c

No change as the removed code is not in FFmpeg

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Trivial merge