Michael Niedermayer 3bf189bb00 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>

2014-04-22 13:45:34 +02:00

132 KiB

Raw Blame History

View Raw