eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 18:10:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
e2a5557cbb7fbcdf38a3240112cbc452930fe8b1
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