Merge commit 'b53d8c3ccfeff77874f5ca7c68136b6d87a0a69c'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:03:25 +0000 (16:03 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:03:25 +0000 (16:03 +0100)
commit1a48a51bfcd0c8b1fd22ae6a8ad5b1e26bec5bee
tree50b3c7cb4f634c16b5757a489d8e06a4fc52dce7
parent7a6514861ecf26fe7f892ddc494c063c5d093023
parentb53d8c3ccfeff77874f5ca7c68136b6d87a0a69c
Merge commit 'b53d8c3ccfeff77874f5ca7c68136b6d87a0a69c'

* commit 'b53d8c3ccfeff77874f5ca7c68136b6d87a0a69c':
  mjpegdec: Drop disabled code

The last chunk is replaced with a comment describing the structure.

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/mjpegdec.c