Merge commit '1ae8198bca749a0cff205196cc83d35b9962849b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 11:45:34 +0000 (13:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 11:45:34 +0000 (13:45 +0200)
commit3bf189bb00863a6ffc88e2a4770ccc6106551a96
treee103600f1b7bf4e0f2e8464defbdbd2039d0b663
parent5e6be52bacb907492f71f7d57978fe10cb278c4c
parent1ae8198bca749a0cff205196cc83d35b9962849b
Merge commit '1ae8198bca749a0cff205196cc83d35b9962849b'

* commit '1ae8198bca749a0cff205196cc83d35b9962849b':
  avconv: always reset packet pts after decoding an audio frame

Conflicts:
ffmpeg.c

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