Merge commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f'
authorClément Bœsch <clement@stupeflix.com>
Wed, 22 Jun 2016 15:36:42 +0000 (17:36 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 22 Jun 2016 15:36:42 +0000 (17:36 +0200)
commita444a50510e76a87f34d5b2e6d4f696b6af7e79b
treec7f6a68b760ea959a41dce61d0f94dbb06f795a3
parent48ac4532d437790e56b8ed5d0d467dc88685f035
parent11de006babf735aafa3462d43dd2c02bb6ac6e2f
Merge commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f'

* commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f':
  Combine deprecation guards where appropriate

Merged-by: Clément Bœsch <clement@stupeflix.com>
libavdevice/v4l2.c
libavformat/mux.c