Merge commit 'f90ff772e7e35b4923c2de429d1fab9f2569b568'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jan 2013 12:32:47 +0000 (13:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jan 2013 12:32:56 +0000 (13:32 +0100)
* commit 'f90ff772e7e35b4923c2de429d1fab9f2569b568':
  Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm.
  doc: update the reference for the title

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/t2h.init
libavcodec/x86/dsputil.asm
libavcodec/x86/h264_qpel_8bit.asm

diff --cc doc/t2h.init
@@@ -64,11 -181,11 +64,11 @@@ sub FFmpeg_float($$$$
      return '<div class="float ' . $class . '">' . "$label\n" . $text . '</div>';
  }
  
 -$print_page_head = \&Libav_print_page_head;
 -sub Libav_print_page_head($$)
 +$print_page_head = \&FFmpeg_print_page_head;
 +sub FFmpeg_print_page_head($$)
  {
      my $fh = shift;
-     my $longtitle = "$Texi2HTML::THISDOC{'title_no_texi'}";
+     my $longtitle = "$Texi2HTML::THISDOC{'fulltitle_no_texi'}";
      $longtitle .= ": $Texi2HTML::NO_TEXI{'This'}" if exists $Texi2HTML::NO_TEXI{'This'};
      my $description = $DOCUMENT_DESCRIPTION;
      $description = $longtitle if (!defined($description));
Simple merge
Simple merge