eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 02:20:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
e623e8cbb033db4e30bb64668e8831f5d7a10f73
ffmpeg/ffmpeg_opt.c
Michael Niedermayer 959894632a Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035' 
* commit '3892bdab9b652eb003ab95e167f1765e0b0ea035':
  avconv: do not overwrite the stream codec context for streamcopy

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04 00:38:02 +02:00

123 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink