Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 13:16:53 +0000 (15:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 13:34:49 +0000 (15:34 +0200)
* commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df':
  tools: do not use av_pix_fmt_descriptors directly.
  pixdesc: add functions for accessing pixel format descriptors.
  build: add support for Tru64 (OSF/1)
  md5: Allocate a normal private context for the opaque md5 context pointer

Conflicts:
cmdutils.c
doc/APIchanges
ffprobe.c
libavformat/md5enc.c
libavutil/version.h
tools/graph2dot.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
cmdutils.c
configure
doc/APIchanges
libavformat/md5enc.c
libavformat/md5proto.c
libavutil/pixdesc.c
libavutil/pixdesc.h
libavutil/version.h
tools/graph2dot.c

diff --cc cmdutils.c
@@@ -1110,10 -882,8 +1110,10 @@@ int show_pix_fmts(void *optctx, const c
  #   define sws_isSupportedOutput(x) 0
  #endif
  
-     for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++) {
-         const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[pix_fmt];
+     while ((pix_desc = av_pix_fmt_desc_next(pix_desc))) {
+         enum AVPixelFormat pix_fmt = av_pix_fmt_desc_get_id(pix_desc);
 +        if(!pix_desc->name)
 +            continue;
          printf("%c%c%c%c%c %-16s       %d            %2d\n",
                 sws_isSupportedInput (pix_fmt)      ? 'I' : '.',
                 sws_isSupportedOutput(pix_fmt)      ? 'O' : '.',
diff --cc configure
+++ b/configure
@@@ -3189,6 -2873,10 +3189,10 @@@ case $target_os i
                        -l:drtaeabi.dso -l:scppnwdl.dso -lsupc++ -lgcc \
                        -l:libc.dso -l:libm.dso -l:euser.dso -l:libcrt0.lib
          ;;
 -        AVSERVERLDFLAGS=
+     osf1)
+         add_cppflags -D_OSF_SOURCE -D_POSIX_PII -D_REENTRANT
++        FFSERVERLDFLAGS=
+         ;;
      none)
          ;;
      *)
diff --cc doc/APIchanges
@@@ -15,88 -13,11 +15,93 @@@ libavutil:     2011-04-1
  
  API changes, most recent first:
  
 +2012-09-27 - a70b493 - lavd 54.3.100 - version.h
 +  Add LIBAVDEVICE_IDENT symbol.
 +
 +2012-09-27 - a70b493 - lavfi 3.18.100 - version.h
 +  Add LIBAVFILTER_IDENT symbol.
 +
 +2012-09-27 - a70b493 - libswr 0.16.100 - version.h
 +  Add LIBSWRESAMPLE_VERSION, LIBSWRESAMPLE_BUILD
 +  and LIBSWRESAMPLE_IDENT symbols.
 +
 +2012-09-06 - 29e972f - lavu 51.72.100 - parseutils.h
 +  Add av_small_strptime() time parsing function.
 +
 +  Can be used as a stripped-down replacement for strptime(), on
 +  systems which do not support it.
 +
 +2012-08-25 - 2626cc4 - lavf 54.28.100
 +  Matroska demuxer now identifies SRT subtitles as AV_CODEC_ID_SUBRIP instead
 +  of AV_CODEC_ID_TEXT.
 +
 +2012-08-13 - 5c0d8bc - lavfi 3.8.100 - avfilter.h
 +  Add avfilter_get_class() function, and priv_class field to AVFilter
 +  struct.
 +
 +2012-08-12 - a25346e - lavu 51.69.100 - opt.h
 +  Add AV_OPT_FLAG_FILTERING_PARAM symbol in opt.h.
 +
 +2012-07-31 - 23fc4dd - lavc 54.46.100
 +  Add channels field to AVFrame.
 +
 +2012-07-30 - f893904 - lavu 51.66.100
 +  Add av_get_channel_description()
 +  and av_get_standard_channel_layout() functions.
 +
 +2012-07-21 - 016a472 - lavc 54.43.100
 +  Add decode_error_flags field to AVFrame.
 +
 +2012-07-20 - b062936 - lavf 54.18.100
 +  Add avformat_match_stream_specifier() function.
 +
 +2012-07-14 - f49ec1b - lavc 54.38.100 - avcodec.h
 +  Add metadata to AVFrame, and the accessor functions
 +  av_frame_get_metadata() and av_frame_set_metadata().
 +
 +2012-07-10 - 0e003d8 - lavc 54.33.100
 +  Add av_fast_padded_mallocz().
 +
 +2012-07-10 - 21d5609 - lavfi 3.2.0 - avfilter.h
 +  Add init_opaque() callback to AVFilter struct.
 +
 +2012-06-26 - e6674e4 - lavu 51.63.100 - imgutils.h
 +  Add functions to libavutil/imgutils.h:
 +  av_image_get_buffer_size()
 +  av_image_fill_arrays()
 +  av_image_copy_to_buffer()
 +
 +2012-06-24 - c41899a - lavu 51.62.100 - version.h
 +  version moved from avutil.h to version.h
 +
 +2012-04-11 - 359abb1 - lavu 51.58.100 - error.h
 +  Add av_make_error_string() and av_err2str() utilities to
 +  libavutil/error.h.
 +
 +2012-06-05 - 62b39d4 - lavc 54.24.100
 +  Add pkt_duration field to AVFrame.
 +
 +2012-05-24 - f2ee065 - lavu 51.54.100
 +  Move AVPALETTE_SIZE and AVPALETTE_COUNT macros from
 +  libavcodec/avcodec.h to libavutil/pixfmt.h.
 +
 +2012-05-14 - 94a9ac1 - lavf 54.5.100
 +  Add av_guess_sample_aspect_ratio() function.
 +
 +2012-04-20 - 65fa7bc - lavfi 2.70.100
 +  Add avfilter_unref_bufferp() to avfilter.h.
 +
 +2012-04-13 - 162e400 - lavfi 2.68.100
 +  Install libavfilter/asrc_abuffer.h public header.
 +
 +2012-03-26 - a67d9cf - lavfi 2.66.100
 +  Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.
 +
+ 2012-10-12 - xxxxxxx - lavu 51.44.0 - pixdesc.h
+   Add functions for accessing pixel format descriptors.
+   Accessing the av_pix_fmt_descriptors array directly is now
+   deprecated.
  2012-10-xx - xxxxxxx - lavu 51.43.0 - aes.h, md5.h, sha.h, tree.h
    Add functions for allocating the opaque contexts for the algorithms,
    deprecate the context size variables.
@@@ -69,7 -76,8 +76,7 @@@ static int write_trailer(struct AVForma
  AVOutputFormat ff_md5_muxer = {
      .name              = "md5",
      .long_name         = NULL_IF_CONFIG_SMALL("MD5 testing"),
-     .priv_data_size    = PRIVSIZE,
 -    .extensions        = "",
+     .priv_data_size    = sizeof(struct MD5Context),
      .audio_codec       = AV_CODEC_ID_PCM_S16LE,
      .video_codec       = AV_CODEC_ID_RAWVIDEO,
      .write_header      = write_header,
@@@ -99,11 -120,13 +119,12 @@@ static int framemd5_write_trailer(struc
  AVOutputFormat ff_framemd5_muxer = {
      .name              = "framemd5",
      .long_name         = NULL_IF_CONFIG_SMALL("Per-frame MD5 testing"),
-     .priv_data_size    = PRIVSIZE,
 -    .extensions        = "",
+     .priv_data_size    = sizeof(struct MD5Context),
      .audio_codec       = AV_CODEC_ID_PCM_S16LE,
      .video_codec       = AV_CODEC_ID_RAWVIDEO,
-     .write_header      = ff_framehash_write_header,
+     .write_header      = framemd5_write_header,
      .write_packet      = framemd5_write_packet,
+     .write_trailer     = framemd5_write_trailer,
      .flags             = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT,
  };
  #endif
Simple merge
Simple merge
Simple merge
@@@ -39,8 -37,8 +39,8 @@@
   */
  
  #define LIBAVUTIL_VERSION_MAJOR 51
- #define LIBAVUTIL_VERSION_MINOR 75
 -#define LIBAVUTIL_VERSION_MINOR 44
 -#define LIBAVUTIL_VERSION_MICRO  0
++#define LIBAVUTIL_VERSION_MINOR 76
 +#define LIBAVUTIL_VERSION_MICRO 100
  
  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                 LIBAVUTIL_VERSION_MINOR, \
@@@ -77,16 -77,14 +77,17 @@@ static void print_digraph(FILE *outfile
                           dst_filter_ctx->name,
                           dst_filter_ctx->filter->name);
  
 -                fprintf(outfile, "\"%s\" -> \"%s\"",
 -                        filter_ctx_label, dst_filter_ctx_label);
 +                fprintf(outfile, "\"%s\" -> \"%s\" [ label= \"inpad:%s -> outpad:%s\\n",
 +                        filter_ctx_label, dst_filter_ctx_label,
 +                        link->srcpad->name, link->dstpad->name);
 +
                  if (link->type == AVMEDIA_TYPE_VIDEO) {
+                     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format);
                      fprintf(outfile,
 -                            " [ label= \"fmt:%s w:%d h:%d tb:%d/%d\" ]",
 -                            desc->name, link->w, link->h, link->time_base.num,
 -                            link->time_base.den);
 +                            "fmt:%s w:%d h:%d tb:%d/%d",
-                             av_pix_fmt_descriptors[link->format].name,
++                            desc->name,
 +                            link->w, link->h,
 +                            link->time_base.num, link->time_base.den);
                  } else if (link->type == AVMEDIA_TYPE_AUDIO) {
                      char buf[255];
                      av_get_channel_layout_string(buf, sizeof(buf), -1,