diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-18 02:12:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-18 02:13:22 +0200 |
| commit | c0894e62881480f2fdedc95a41101f1add03d419 (patch) | |
| tree | e910ff5d2e17e95f5a054fe0f1ec011391f76b73 /libavcodec/flac.c | |
| parent | b1861f18b6e384f3b5cd071f49b43a2b2e8607e1 (diff) | |
| parent | 256ef19844892c6cf8e0386e3287bae970ec6320 (diff) | |
| download | ffmpeg-c0894e62881480f2fdedc95a41101f1add03d419.tar.gz | |
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: 565cabf5c80b25d86c2e539afcb3b24024fbce0a
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/flac.c')
0 files changed, 0 insertions, 0 deletions