Merge commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 19:00:08 +0000 (21:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 19:13:01 +0000 (21:13 +0200)
commit0b0d47e4b21e8936707183967d840f64ba055cb2
tree2fc966ace26f75749fe80a14941acf9b71d4bebe
parent45fed258ee6a58ca7e12a94936fa24b742d48f69
parentbae557edcea996328e8ff48b9e074a4210f7e6b4
Merge commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4'

* commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4':
  dump: display codec tags when available

Conflicts:
libavcodec/utils.c

See: d2d7b7134fc387837d51aa1d7f3dbe090d35e8b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c