highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
dcad6ba68abbba579cf3d90ebffce13c7d68f41c
ffmpeg/libavcodec/h264_slice.c
Michael Niedermayer 928b5708f9 Merge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2' 
* commit '34c5a6660a9e5e3cf301691bb29d011638953dc2':
  h264: codec reinit: remove statements without effect

Conflicts:
	libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 18:50:32 +02:00

96 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink