pjproject-avcodec.patch

   1 diff -dur pjproject-217740d99457fc8492d3a68f90fa25a52bd8eca9.orig/pjmedia/src/pjmedia/ffmpeg_util.c pjproject-217740d99457fc8492d3a68f90fa25a52bd8eca9/pjmedia/src/pjmedia/ffmpeg_util.c
   2 --- pjproject-217740d99457fc8492d3a68f90fa25a52bd8eca9.orig/pjmedia/src/pjmedia/ffmpeg_util.c   2013-11-14 22:24:47.000000000 +0100
   3 +++ pjproject-217740d99457fc8492d3a68f90fa25a52bd8eca9/pjmedia/src/pjmedia/ffmpeg_util.c        2014-01-07 12:15:00.000000000 +0100
   4 @@ -62,7 +62,7 @@
   5  static const struct ffmpeg_codec_table_t
   6  {
   7      pjmedia_format_id  id;
   8 -    enum CodecID       codec_id;
   9 +    enum AVCodecID     codec_id;
  10  } ffmpeg_codec_table[] =
  11  {
  12      {PJMEDIA_FORMAT_H261,      CODEC_ID_H261},
  13 @@ -165,7 +165,7 @@
  14  }
  15
  16  pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id,
  17 -                                        enum CodecID *codec_id)
  18 +                                        enum AVCodecID *codec_id)
  19  {
  20      unsigned i;
  21      for (i=0; i<PJ_ARRAY_SIZE(ffmpeg_codec_table); ++i) {
  22 @@ -180,7 +180,7 @@
  23      return PJ_ENOTFOUND;
  24  }
  25
  26 -pj_status_t CodecID_to_pjmedia_format_id(enum CodecID codec_id,
  27 +pj_status_t CodecID_to_pjmedia_format_id(enum AVCodecID codec_id,
  28                                          pjmedia_format_id *fmt_id)
  29  {
  30      unsigned i;
  31 diff -dur pjproject-217740d99457fc8492d3a68f90fa25a52bd8eca9.orig/pjmedia/src/pjmedia/ffmpeg_util.h pjproject-217740d99457fc8492d3a68f90fa25a52bd8eca9/pjmedia/src/pjmedia/ffmpeg_util.h
  32 --- pjproject-217740d99457fc8492d3a68f90fa25a52bd8eca9.orig/pjmedia/src/pjmedia/ffmpeg_util.h   2013-11-14 22:24:47.000000000 +0100
  33 +++ pjproject-217740d99457fc8492d3a68f90fa25a52bd8eca9/pjmedia/src/pjmedia/ffmpeg_util.h        2014-01-07 12:13:32.000000000 +0100
  34 @@ -47,9 +47,9 @@
  35                                              pjmedia_format_id *fmt_id);
  36
  37  pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id,
  38 -                                        enum CodecID *codec_id);
  39 +                                        enum AVCodecID *codec_id);
  40
  41 -pj_status_t CodecID_to_pjmedia_format_id(enum CodecID codec_id,
  42 +pj_status_t CodecID_to_pjmedia_format_id(enum AVCodecID codec_id,
  43                                          pjmedia_format_id *fmt_id);
  44
  45  #endif /* __PJMEDIA_FFMPEG_UTIL_H__ */