Merge commit 'd42ea06798b83d87397449ec6aad40cb5ea46e43'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Mar 2014 18:23:57 +0000 (19:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Mar 2014 18:24:09 +0000 (19:24 +0100)
* commit 'd42ea06798b83d87397449ec6aad40cb5ea46e43':
  codec_desc: add missing .long_name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/codec_desc.c

Simple merge