Combine deprecation guards where appropriate
authorDiego Biurrun <diego@biurrun.de>
Tue, 3 May 2016 22:32:26 +0000 (00:32 +0200)
committerDiego Biurrun <diego@biurrun.de>
Fri, 13 May 2016 13:14:30 +0000 (15:14 +0200)
commit11de006babf735aafa3462d43dd2c02bb6ac6e2f
tree8391bb4100f6f44b8c31954e4d0139c05e98271f
parenta6a750c7ef240b72ce01e9653343a0ddf247d196
Combine deprecation guards where appropriate

Some code blocks use multiple bits of deprecated API.
libavdevice/v4l2.c
libavformat/mux.c