Merge commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 13:03:22 +0000 (14:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 13:03:22 +0000 (14:03 +0100)
commit849f015406e77921a2adbe05e58b0e65cbf035c5
tree05a8b30cd52af9bbaf0ca6be59a2aae079600077
parenta62fced394825101b202a8bc6055e4932b371089
parenta4472ac01e86f9fae5adb9034f2777b86a9c5480
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>
libavcodec/h264.c
libavformat/anm.c
libavformat/spdifenc.c
libavformat/xwma.c