Merge commit 'f7518f1a0e0a1788c303de3c6198da07e575710c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 13:52:02 +0000 (14:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 13:53:05 +0000 (14:53 +0100)
* commit 'f7518f1a0e0a1788c303de3c6198da07e575710c':
  codec_desc: update dvaudio tag

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

Simple merge