[FFmpeg-cvslog] Merge commit '62de693a17f9b107be7867d822d5accacd4be544' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Tue Feb  5 16:19:17 2013 +0100| [85e94a30eeb97ac73959fa0e330c5c68e31942e6] | committer: Michael Niedermayer

Merge commit '62de693a17f9b107be7867d822d5accacd4be544' into release/1.1

* commit '62de693a17f9b107be7867d822d5accacd4be544':
  rtp: Make sure priv_data is set before reading it
  videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
  get_bits: change the failure condition in init_get_bits
  mpegvideo: fix loop condition in draw_line()

Conflicts:
	libavcodec/get_bits.h
	libavcodec/mpegvideo.c

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

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