aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/framesync.c
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-03-12 13:13:55 +0100
committerClément Bœsch <u@pkh.me>2017-03-12 13:13:55 +0100
commit15f6e5f2a9568226a853880ab5f0d8e6e7d77544 (patch)
tree761e895d1d4cdb326bfc0b20a089a52847b04f94 /libavfilter/framesync.c
parente514309a916e295c5b49c6c83e93ffc15a12317d (diff)
parent8b7a9729aa162e2bbd571933f1aa40767f1ff47b (diff)
downloadffmpeg-15f6e5f2a9568226a853880ab5f0d8e6e7d77544.tar.gz
Merge commit '8b7a9729aa162e2bbd571933f1aa40767f1ff47b'
* commit '8b7a9729aa162e2bbd571933f1aa40767f1ff47b': avconv_qsv: use the actual pixel format provided by lavc This commit is a noop, see 03cef34aa66 Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavfilter/framesync.c')
0 files changed, 0 insertions, 0 deletions