RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
63,463 Commits 36 Branches 398 Tags 234 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
Michael Niedermayer 0626211b56 Merge commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0' 
* commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0':
  h264: move macroblock decoding into its own file

Conflicts:
	libavcodec/Makefile
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 00:46:20 +01:00
Vittorio Giovara e9a77f4bc0 h264: move macroblock decoding into its own file 2014-03-23 22:41:12 +01:00