Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 20:38:53 +0000 (21:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 20:38:53 +0000 (21:38 +0100)
commit0460b9bb3e34472223084a6c3ad35b4ded9c276b
treea2b5d65619679309b96a8cc9b372c61ad0ab0afd
parent15b1b0887466f5c9ab3185a8fb62ebe54c0ff01b
parentc872d310cd9c605e5f994ad8ac79dc72303c0d29
Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'

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

Conflicts:
ffmpeg.h

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