[SCM] libav/experimental: add new h264 and aac flv ids

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit fbabb0c277c312785fc0ca7b836043d1ad5bd219
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Fri May 23 22:02:29 2008 +0000

    add new h264 and aac flv ids
    
    Originally committed as revision 13269 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/flv.h b/libavformat/flv.h
index 4501527..ed02191 100644
--- a/libavformat/flv.h
+++ b/libavformat/flv.h
@@ -77,6 +77,7 @@ enum {
     FLV_CODECID_PCM_LE              = 3 << FLV_AUDIO_CODECID_OFFSET,
     FLV_CODECID_NELLYMOSER_8HZ_MONO = 5 << FLV_AUDIO_CODECID_OFFSET,
     FLV_CODECID_NELLYMOSER          = 6 << FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_AAC                 = 10<< FLV_AUDIO_CODECID_OFFSET,
 };
 
 enum {
@@ -85,6 +86,7 @@ enum {
     FLV_CODECID_VP6     = 4,
     FLV_CODECID_VP6A    = 5,
     FLV_CODECID_SCREEN2 = 6,
+    FLV_CODECID_H264    = 7,
 };
 
 enum {

-- 
Libav/FFmpeg packaging