Merge commit '62de693a17f9b107be7867d822d5accacd4be544' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Feb 2013 15:19:17 +0000 (16:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Feb 2013 15:19:17 +0000 (16:19 +0100)
commit85e94a30eeb97ac73959fa0e330c5c68e31942e6
tree5e5d68b439eef42d44e0b217938acc1caf250f5d
parent3445bec6fc1de92a6ebef1ada2e5aa850fde9e94
parent62de693a17f9b107be7867d822d5accacd4be544
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@gmx.at>
libavcodec/arm/videodsp_armv5te.S
libavcodec/get_bits.h
libavcodec/mpegvideo.c
libavformat/rtp.c