Merge commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jan 2013 14:36:35 +0000 (15:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jan 2013 14:36:35 +0000 (15:36 +0100)
commitf9d5bdd0f6526e852ec37528c9b5f97beb71ef07
tree3fce75f86b6fc11866615307a7d6bfc0498cc5b1
parent4adc8a29a0565cb35815eeb8e693b47dcaf890ce
parent1a31dff9370b4732c91df5cb1ca4b39f2cb3050e
Merge commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e'

* commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e':
  loco: return meaningful error codes.
  flicvideo: return meaningful error codes.
  vcr1: remove disabled encoder stub

Conflicts:
libavcodec/flicvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/flicvideo.c
libavcodec/loco.c
libavcodec/vcr1.c