Merge commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 11 May 2016 18:43:59 +0000 (19:43 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 11 May 2016 18:45:20 +0000 (19:45 +0100)
commited8bacfb5ca888255e8e15e44fb25722d31cf565
tree858b5cb05a2ba6e093c88cb34d08d4e1c3a7d6e4
parent8ed427f9f92fd45c2510c019dba932acda74817f
parent5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a
Merge commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a'

* commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a':
  lavc: move the vaapi encoders further down in the list of codecs

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/allcodecs.c