Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 02:56:43 +0000 (03:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 02:56:43 +0000 (03:56 +0100)
commit6ee2911996ed5aea8fd49fd264cfb7930a7cd10e
tree124917f72c0c720c4e019a41dc917cdca0b7c5a2
parentacb8d655d7507e4af8c5ba8e0e3a8ed74ce30c94
parent6f6c0294646bf992abd670d4c5c53c15a38346fd
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: drop ff_pixfmt_list_420

Conflicts:
libavcodec/flvdec.c
libavcodec/msmpeg4dec.c
libavcodec/rv10.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/flvdec.c
libavcodec/intelh263dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/msmpeg4dec.c
libavcodec/rv10.c
libavcodec/rv30.c
libavcodec/rv40.c
libavcodec/vc1dec.c
libavcodec/wmv2dec.c