aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_null.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-17 14:00:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-17 14:00:01 +0200
commit5fce29ef29e416d843a139e083ae9d3f7783132a (patch)
treebbcb461ca841e57c4fd3387de9cf21e946e13ece /libavfilter/vf_null.c
parentb884599f6a1c05ed8a0cbab72ac898d21456a58b (diff)
parent2db953f84671997e936f91140ffb5143c1537844 (diff)
downloadffmpeg-5fce29ef29e416d843a139e083ae9d3f7783132a.tar.gz
Merge commit '2db953f84671997e936f91140ffb5143c1537844'
* commit '2db953f84671997e936f91140ffb5143c1537844': h264: K&R formatting cosmetics Conflicts: libavcodec/h264.c libavcodec/h264_direct.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_null.c')
0 files changed, 0 insertions, 0 deletions