aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/samplefmt.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-21 00:22:14 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-21 00:24:43 +0100
commitd6b7ea06f19492c0e51a0ba884e048a1b5aaaa86 (patch)
tree2ae5249d0d454fba435e1c1bbd6437831403c420 /libavutil/samplefmt.c
parent6fc9f5e0ff77f827ae0982099b8fcc683bf0063c (diff)
parent2a41826bea3833895dc06939831b7f35ca1f597e (diff)
downloadffmpeg-d6b7ea06f19492c0e51a0ba884e048a1b5aaaa86.tar.gz
Merge commit '2a41826bea3833895dc06939831b7f35ca1f597e'
* commit '2a41826bea3833895dc06939831b7f35ca1f597e': lavc: add HEVC profiles names Conflicts: libavcodec/hevc.c libavcodec/version.h See: fb7d70c1cd95529cbbbeeab5e9fa3b200ef2545c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/samplefmt.c')
0 files changed, 0 insertions, 0 deletions