[FFmpeg-cvslog] Merge commit 'd338abb664febbc2c7266af7818aab1f12dbc161'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Jun 22 20:05:03 2016 +0200| [7475a9351f57a157cddf47db7a00b7922c7bd994] | committer: Clément Bœsch

Merge commit 'd338abb664febbc2c7266af7818aab1f12dbc161'

* commit 'd338abb664febbc2c7266af7818aab1f12dbc161':
  mpeg4videodec: Call av_log() in check_marker() with AVCodecContext instead of NULL

This commit is a noop.

Since check_marker() is still in get_bits.h in FFmpeg and shared amongst
decoders, a similar but different change will be committed in the next
commit in to serve the same purpose of this one (that is, passing a
logging context to the av_log() in that function).

Merged-by: Clément Bœsch <u at pkh.me>

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