Michael Niedermayer 0460b9bb3e Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29' ...

* commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29':
  avconv: stop accessing AVStream.parser

Conflicts:
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-10-29 21:38:53 +01:00

13 KiB

Raw Blame History

View Raw