Merge commit 'cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2'
authorClément Bœsch <u@pkh.me>
Wed, 26 Apr 2017 14:30:01 +0000 (16:30 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 26 Apr 2017 14:30:01 +0000 (16:30 +0200)
* commit 'cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2':
  libavformat: Fix a faulty api deprecation guard in prepare_input_packet

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavformat/mux.c

Simple merge