Merge commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480'

* commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480':
  Add informative messages to av_log_ask_for_sample calls lacking them
  anm: Get rid of some very silly goto statements

Conflicts:
	libavformat/anm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/h264.c
Simple merge

diff --cc libavformat/anm.c
Simple merge

diff --cc libavformat/spdifenc.c
Simple merge

diff --cc libavformat/xwma.c
Simple merge