Merge commit 'd749615333084e62c9fcc480d1ae466369fdf14f'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 31 Jan 2016 12:28:04 +0000 (12:28 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 31 Jan 2016 12:28:04 +0000 (12:28 +0000)
commit9938697c1c119a675759029ead74b91c529cdf2e
treedf594b8ceda53d29763040312c6ea48c692e2781
parentb4af7d68fe14c6978a1a2f8b1bb34fd50d189160
parentd749615333084e62c9fcc480d1ae466369fdf14f
Merge commit 'd749615333084e62c9fcc480d1ae466369fdf14f'

* commit 'd749615333084e62c9fcc480d1ae466369fdf14f':
  lavc: Move timecode_frame_start to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/avcodec.h
libavcodec/mpeg12enc.c
libavcodec/mpegvideo.h
libavcodec/options_table.h