[FFmpeg-cvslog] Merge commit '5781bfae0cf4271278a8bea176d615cb5c222335'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Feb 16 17:37:47 2016 +0000| [8bbca8de394404772b1544ffd4c42e5731bf770f] | committer: Derek Buitenhuis

Merge commit '5781bfae0cf4271278a8bea176d615cb5c222335'

This commit is a no-op.

* commit '5781bfae0cf4271278a8bea176d615cb5c222335':
  flacenc: Load default prediction_order parameters if none is selected
  asfdec: make sure packet_size is non-zero before seeking
  asfdec: check for too small size in asf_read_unknown
  asfdec: check avio_skip in asf_read_simple_index
  asfdec: break if EOF is reached after asf_read_packet_header

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8bbca8de394404772b1544ffd4c42e5731bf770f
---