[FFmpeg-cvslog] Merge commit '1ae8198bca749a0cff205196cc83d35b9962849b'
Michael Niedermayer
git at videolan.org
Tue Apr 22 13:56:52 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 22 13:45:34 2014 +0200| [3bf189bb00863a6ffc88e2a4770ccc6106551a96] | committer: Michael Niedermayer
Merge commit '1ae8198bca749a0cff205196cc83d35b9962849b'
* commit '1ae8198bca749a0cff205196cc83d35b9962849b':
avconv: always reset packet pts after decoding an audio frame
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3bf189bb00863a6ffc88e2a4770ccc6106551a96
---
More information about the ffmpeg-cvslog
mailing list