Merge commit 'bbf71d46db3417b43bcbd745cbf235e8e2ff69ae'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 26 Sep 2015 09:14:01 +0000 (11:14 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 26 Sep 2015 09:14:01 +0000 (11:14 +0200)
* commit 'bbf71d46db3417b43bcbd745cbf235e8e2ff69ae':
  dxv: Print texture information after header parsing

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/dxv.c

Simple merge