eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 05:35:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
50b77e364f0a8c94de523e1d5afcd2be0a9a0384
ffmpeg/libavcodec/hapenc.c
Michael Niedermayer 55219a78c7 Merge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7' 
* commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7':
  Hap decoder and encoder

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/allcodecs.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-22 22:47:32 +02:00

6.5 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink