eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 01:40:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
ea75580186e1bf9c308a901b87187e257c97be05
ffmpeg/libavcodec/arm/h264pred_init_arm.c
Michael Niedermayer c0894e6288 Merge commit '256ef19844892c6cf8e0386e3287bae970ec6320' 
* commit '256ef19844892c6cf8e0386e3287bae970ec6320':
  h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1

Conflicts:
	libavcodec/arm/h264pred_init_arm.c

See: 565cabf5c8
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18 02:13:22 +02:00

4.1 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink