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)
* 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>
1  2 
libavcodec/flicvideo.c
libavcodec/loco.c
libavcodec/vcr1.c

Simple merge
Simple merge
Simple merge