Merge commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 11:30:38 +0000 (13:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 11:30:38 +0000 (13:30 +0200)
commit74128352047ee3fb075b0f69ab16047f70b45a42
tree944418d43c9d6c56865bd06f14ad6af46748a443
parent17d16008befa82cb79e71fbb4dc28fb4d9ec2ce6
parenta6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf
Merge commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf'

* commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf':
  lavc: make rc_qsquish a private option of mpegvideo encoders

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h
libavcodec/ratecontrol.c
libavcodec/version.h