aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_pixdesctest.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-24 01:24:55 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-24 01:33:02 +0100
commitffd77f94a26be22b8ead3178ceec3ed39e68abc5 (patch)
tree0e7982c66986de2d8aa41102610a87866e042bec /libavfilter/vf_pixdesctest.c
parent0626211b561f299971a96b7bd1ee6f8a6d6735c8 (diff)
parentf51d0f39c0fb3470d6b186974109428da91f1d1b (diff)
downloadffmpeg-ffd77f94a26be22b8ead3178ceec3ed39e68abc5.tar.gz
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>
Diffstat (limited to 'libavfilter/vf_pixdesctest.c')
0 files changed, 0 insertions, 0 deletions