[FFmpeg-cvslog] Merge commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov  1 13:28:33 2013 +0100| [5ef0c00580e25afa32d5a6ef86559ffb9ce3b2dc] | committer: Michael Niedermayer

Merge commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5'

* commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5':
  ansi: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/ansi.c

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

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