eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-06 22:25:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
a696b0917d1d1ef5b0dee691786ddb51ee4ab519
ffmpeg/libavcodec/h264_picture.c
Michael Niedermayer ffd77f94a2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: Split h264 slice decoding from nal decoding

Conflicts:
	libavcodec/Makefile
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 01:33:02 +01:00

6.4 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink