eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-23 07:20:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
05cc8c8e4b7008ff3be8ec477c901b2ceca4b16b
ffmpeg/libavcodec/elsdec.h
Michael Niedermayer 68939f7682 Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368' 
* commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368':
  Go2Meeting decoder

Conflicts:
	Changelog
	libavcodec/g2meet.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 03:18:30 +02:00

1.7 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink