eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-19 21:40:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
d7888ff644f5965b7a54ecefea9af1469fd1d510
ffmpeg/ffmpeg.c
Michael Niedermayer 4347cf9f0f Merge commit '420aa06a2487469259a04f9be66fd15535372796' into release/2.4 
* commit '420aa06a2487469259a04f9be66fd15535372796':
  avconv: do not overwrite the stream codec context for streamcopy

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-05 16:08:29 +02:00

137 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink