Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Oct 2011 01:42:14 +0000 (03:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Oct 2011 01:42:14 +0000 (03:42 +0200)
* qatar/master:
  Fix 'heigth' vs. 'height' typos.
  lavc/lavf: use unique private classes.
  lavc: use designated initializers for av_codec_context_class

Conflicts:
libavdevice/fbdev.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/filters.texi
libavcodec/ac3dec.c
libavcodec/dnxhddec.c
libavcodec/options.c
libavdevice/fbdev.c
libavformat/img2.c
libavformat/movenc.c

Simple merge
Simple merge
Simple merge
@@@ -517,10 -516,16 +517,17 @@@ static const AVOption options[]=
  #undef D
  #undef DEFAULT
  
- static const AVClass av_codec_context_class = { "AVCodecContext", context_to_name, options, LIBAVUTIL_VERSION_INT, OFFSET(log_level_offset), .opt_find = opt_find};
+ static const AVClass av_codec_context_class = {
+     .class_name              = "AVCodecContext",
+     .item_name               = context_to_name,
+     .option                  = options,
+     .version                 = LIBAVUTIL_VERSION_INT,
+     .log_level_offset_offset = OFFSET(log_level_offset),
+     .opt_find                = opt_find,
+ };
  
  void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType codec_type){
 +    int flags=0;
      memset(s, 0, sizeof(AVCodecContext));
  
      s->av_class= &av_codec_context_class;
@@@ -225,7 -223,8 +225,7 @@@ static int fbdev_read_packet(AVFormatCo
                          fbdev->varinfo.yoffset * fbdev->fixinfo.line_length;
      pout = pkt->data;
  
-     for (i = 0; i < fbdev->heigth; i++) {
 -    // TODO it'd be nice if the lines were aligned
+     for (i = 0; i < fbdev->height; i++) {
          memcpy(pout, pin, fbdev->frame_linesize);
          pin  += fbdev->fixinfo.line_length;
          pout += fbdev->frame_linesize;
Simple merge
Simple merge