Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 19 Feb 2012 23:47:46 +0000 (00:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Feb 2012 00:29:30 +0000 (01:29 +0100)
commitbe2e211dce2964f922e5dee54a7569ebd6efb0da
treea1b6e3a9f5b577230d8c9c2b5b5bcba289ee79f5
parentf4f386dd00e594dc90eb32ae872ae8e22b08d179
parent6b8b0fe2bc57fdd606074e52ba73cd9b3d95e644
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doxy: remove reference to removed api
  examples: unbreak compilation
  ttadec: cosmetics: reindent
  sunrast: use RLE trigger macro inplace of the hard coded value.
  sunrastenc: set keyframe flag for the output packet.
  mpegvideo_enc: switch to encode2().
  mpegvideo_enc: force encoding delay of at least 1 frame when low_delay=0

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
15 files changed:
doc/examples/decoding_encoding.c
doc/examples/muxing.c
libavcodec/flvenc.c
libavcodec/h261enc.c
libavcodec/mjpegenc.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/rv10enc.c
libavcodec/rv20enc.c
libavcodec/sunrast.c
libavcodec/tta.c
libavcodec/wmv2enc.c
libavformat/avformat.h