Merge commit 'b3739599bda740ac12d3dde31a331b744df99123'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 19:04:31 +0000 (16:04 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 19:04:31 +0000 (16:04 -0300)
commit7b550c5f84f21ce883e86bc91f16093641d5dc85
tree5cffe208a3e3c1577e0be2efe49310745d889100
parentd658e04337c590043190718ec4a8137d3e8216b9
parentb3739599bda740ac12d3dde31a331b744df99123
Merge commit 'b3739599bda740ac12d3dde31a331b744df99123'

* commit 'b3739599bda740ac12d3dde31a331b744df99123':
  lavc: Drop deprecated emu edge functionality

Merged-by: James Almer <jamrial@gmail.com>
fftools/ffmpeg_opt.c
fftools/ffplay.c
libavcodec/avcodec.h
libavcodec/mjpegenc.c
libavcodec/options_table.h
libavcodec/snowenc.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/wmv2dec.c