eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-17 04:20:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
0ebcf878032fa32a02e406a3397b51dc8b45109d
ffmpeg/libavformat/nutenc.c
Michael Niedermayer 2d70282254 Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c' 
* commit 'd754ed41727b1fcbab335b510248a9758a73320c':
  riffenc: take an AVStream instead of an AVCodecContext

Conflicts:
	libavformat/nutenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18 17:47:12 +02:00

41 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink