[SCM] libav/experimental: Disambiguate bitstream groups for AAC and RV30/RV40.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 423c254c18f13a84588713424bde0f90dc23783d
Author: Diego Biurrun <diego at biurrun.de>
Date:   Fri Jul 2 12:55:36 2010 +0000

    Disambiguate bitstream groups for AAC and RV30/RV40.
    
    Originally committed as revision 23995 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index 7dbc0c3..b586aa0 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -393,7 +393,7 @@ static inline void rv34_dequant4x4_16x16(DCTELEM *block, int Qdc, int Q)
 
 
 /**
- * @defgroup bitstream RV30/40 bitstream parsing
+ * @defgroup rv3040_bitstream RV30/40 bitstream parsing
  * @{
  */
 
diff --git a/libavcodec/sbr.h b/libavcodec/sbr.h
index 1c87a2e..82a996f 100644
--- a/libavcodec/sbr.h
+++ b/libavcodec/sbr.h
@@ -58,7 +58,7 @@ typedef struct {
  */
 typedef struct {
     /**
-     * @defgroup bitstream     Main bitstream data variables
+     * @defgroup aac_bitstream     Main bitstream data variables
      * @{
      */
     unsigned           bs_frame_class;

-- 
Libav/FFmpeg packaging