1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-29 21:47:48 +02:00
FFmpeg/libavcodec
Michael Niedermayer 0796a2ab4f Merge commit 'eb31256f12bf0c85aded1612551ce9230356879e'
* commit 'eb31256f12bf0c85aded1612551ce9230356879e':
  g2meet: Support G2M5 codec variant

Conflicts:
	libavcodec/version.h

See: 4ba5420e4d3699b89c9f7f15928cd486f88e9562
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 11:52:19 +02:00
..
2015-04-18 14:13:59 -03:00
2015-04-20 04:11:23 +02:00
2015-04-18 14:15:07 -03:00
2015-04-18 14:14:24 -03:00
2015-04-18 14:14:11 -03:00
2015-04-19 23:45:35 +01:00
2015-04-15 09:48:47 +02:00
2015-04-18 18:07:54 -03:00