virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-12-04 14:00:22 +02:00
Code Issues Releases Activity
Files
23cd5cb18f55c84bae48b08ff6563d5301c451d9
FFmpeg/ffmpeg.c
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
Reference in New Issue View Git Blame Copy Permalink