Merge commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 13:05:16 +0000 (14:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 13:05:16 +0000 (14:05 +0100)
commita77a27a24b27fc29d119b00866740e4d0b69ba28
treef3f21b0eb79152d88dab355297992d26d9d1c2a0
parent6f5f0671f3d6db98551822728d413c367e52c377
parent2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2
Merge commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2'

* commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2':
  libx264: change i_qfactor to use x264cli's default
  qtrle: use AV_LOG_ERROR in an error message.

Conflicts:
libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libx264.c
libavcodec/qtrle.c