Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jul 2013 11:44:34 +0000 (13:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jul 2013 11:44:34 +0000 (13:44 +0200)
commitb0edd599940491d04a49b6b4e85189460313ebd9
treeb764f105a2f5d1fab051441e8b0bf2704d169f2b
parent8ff23f0e3c9a6665c34c45b5635c2c149d30b264
parentbf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2
Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2'

* commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2':
  Add missing deprecation attributes

Conflicts:
libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavfilter/avfilter.h
libavutil/pixdesc.h