[FFmpeg-trac] #464(FFmpeg:new): Bad merge commit from qatar/master ?

[FFmpeg]

#464: Bad merge commit from qatar/master ?
--------------------------------------+---------------------------------
               Reporter:  zimbatm     |                  Owner:  michael
                   Type:  defect      |                 Status:  new
               Priority:  normal      |              Component:  FFmpeg
                Version:  git-master  |               Keywords:
             Blocked By:              |               Blocking:
Reproduced by developer:  0           |  Analyzed by developer:  0
--------------------------------------+---------------------------------
 After the merge commit 411cc5c46a89ce0a79832c37d0eab1ed884e5423,
 opt_thread_count is missing from ffmpeg.c (with other things) but still
 present if ffplay.c

 I think this change was unintended

-- 
Ticket URL: <https://ffmpeg.org/trac/ffmpeg/ticket/464>
FFmpeg <http://ffmpeg.org>
FFmpeg issue tracker