aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/pel_template.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-21 13:58:11 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-21 13:59:16 +0100
commit6ec279b54c09f47208930021a38a742f2cc09324 (patch)
treec02bfae014bb7a1a3e1706ea8b82d0cc85d2eca0 /libavcodec/pel_template.c
parent20f5be1038fcf9f88d5c74c16c01dd21584405b3 (diff)
parent64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e (diff)
downloadffmpeg-6ec279b54c09f47208930021a38a742f2cc09324.tar.gz
Merge commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e'
* commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e': h264: move *_samples_available into the per-slice context Conflicts: libavcodec/h264.c libavcodec/h264_mb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pel_template.c')
0 files changed, 0 insertions, 0 deletions