Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Apr 2011 01:50:23 +0000 (03:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Apr 2011 01:54:30 +0000 (03:54 +0200)
* qatar/master:
  APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
  Introduce slice threads flag.
  FATE: allow forcing thread-type when doing threaded fate runs.
  Use av_log_ask_for_sample() where appropriate.
  error: sort, pack, and align error code and string definitions
  The stabilization period after version bumps should be one month, not one week.
  applehttp: Expose the stream bitrate via metadata
  doc: Add some initial docs on the applehttp demuxer
  Provide a fallback version of the libm function trunc
  libavdevice: Define _XOPEN_SOURCE for usleep
  lavc: provide deprecated avcodec_thread_init until next major version
  lavc: provide the opt.h header until the next bump
  error: change AVERROR_EOF value
  error: remove AVERROR_NUMEXPECTED
  error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c

Conflicts:
libavcodec/h264.c
libavutil/error.c
libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
31 files changed:
1  2 
Makefile
configure
doc/APIchanges
doc/demuxers.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/cook.c
libavcodec/dnxhdenc.c
libavcodec/dv.c
libavcodec/ffv1.c
libavcodec/h264.c
libavcodec/mpeg12.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo_enc.c
libavcodec/pthread.c
libavcodec/truemotion1.c
libavcodec/tta.c
libavcodec/utils.c
libavcodec/v210x.c
libavcodec/version.h
libavdevice/bktr.c
libavformat/applehttp.c
libavformat/avformat.h
libavformat/utils.c
libavformat/version.h
libavutil/error.c
libavutil/error.h
libavutil/libm.h
libavutil/opt.c

diff --cc Makefile
Simple merge
diff --cc configure
+++ b/configure
@@@ -1126,8 -1118,8 +1126,9 @@@ HAVE_LIST=
      sys_soundcard_h
      sys_videoio_h
      ten_operands
 +    termios_h
      threads
+     trunc
      truncf
      vfp_args
      VirtualAlloc
diff --cc doc/APIchanges
Simple merge
Simple merge
diff --cc ffmpeg.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc libavcodec/dv.c
Simple merge
Simple merge
@@@ -3467,11 -3426,10 +3467,13 @@@ AVCodec ff_h264_decoder = 
      NULL,
      ff_h264_decode_end,
      decode_frame,
-     /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_FRAME_THREADS,
+     /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY |
++        CODEC_CAP_FRAME_THREADS |
+         CODEC_CAP_SLICE_THREADS,
      .flush= flush_dpb,
      .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
 +    .init_thread_copy      = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy),
 +    .update_thread_context = ONLY_IF_THREADS_ENABLED(decode_update_thread_context),
      .profiles = NULL_IF_CONFIG_SMALL(profiles),
  };
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -25,19 -25,19 +25,19 @@@ int av_strerror(int errnum, char *errbu
      const char *errstr = NULL;
  
      switch (errnum) {
-     case AVERROR_EOF:               errstr = "End of file"; break;
-     case AVERROR_INVALIDDATA:       errstr = "Invalid data found when processing input"; break;
-     case AVERROR_NUMEXPECTED:       errstr = "Number syntax expected in filename"; break;
+     case AVERROR_BSF_NOT_FOUND:     errstr = "Bitstream filter not found"                   ; break;
+     case AVERROR_DECODER_NOT_FOUND: errstr = "Decoder not found"                            ; break;
+     case AVERROR_DEMUXER_NOT_FOUND: errstr = "Demuxer not found"                            ; break;
+     case AVERROR_ENCODER_NOT_FOUND: errstr = "Encoder not found"                            ; break;
+     case AVERROR_EOF:               errstr = "End of file"                                  ; break;
+     case AVERROR_EXIT:              errstr = "Immediate exit requested"                     ; break;
+     case AVERROR_FILTER_NOT_FOUND:  errstr = "Filter not found"                             ; break;
+     case AVERROR_INVALIDDATA:       errstr = "Invalid data found when processing input"     ; break;
+     case AVERROR_MUXER_NOT_FOUND:   errstr = "Muxer not found"                              ; break;
+     case AVERROR_OPTION_NOT_FOUND:  errstr = "Option not found"                             ; break;
 -    case AVERROR_PATCHWELCOME:      errstr = "Not yet implemented in Libav, patches welcome"; break;
 +    case AVERROR_PATCHWELCOME:      errstr = "Not yet implemented in FFmpeg, patches welcome"; break;
-     case AVERROR_DEMUXER_NOT_FOUND: errstr = "Demuxer not found"; break;
-     case AVERROR_MUXER_NOT_FOUND:   errstr = "Muxer not found"; break;
-     case AVERROR_DECODER_NOT_FOUND: errstr = "Decoder not found"; break;
-     case AVERROR_ENCODER_NOT_FOUND: errstr = "Encoder not found"; break;
-     case AVERROR_PROTOCOL_NOT_FOUND:errstr = "Protocol not found"; break;
-     case AVERROR_FILTER_NOT_FOUND:  errstr = "Filter not found"; break;
-     case AVERROR_BSF_NOT_FOUND:     errstr = "Bitstream filter not found"; break;
-     case AVERROR_STREAM_NOT_FOUND:  errstr = "Stream not found"; break;
-     case AVERROR_EXIT:              errstr = "Immediate exit requested"; break;
+     case AVERROR_PROTOCOL_NOT_FOUND:errstr = "Protocol not found"                           ; break;
+     case AVERROR_STREAM_NOT_FOUND:  errstr = "Stream not found"                             ; break;
      }
  
      if (errstr) {
  #define AVUNERROR(e) (e)
  #endif
  
- #define AVERROR_EOF         AVERROR(EPIPE)   ///< End of file
 +#define AVERROR_IO          AVERROR(EIO)     ///< I/O error
 +#define AVERROR_NOENT       AVERROR(ENOENT)  ///< No such file or directory
 +#define AVERROR_NOFMT       AVERROR(EILSEQ)  ///< Unknown format
 +#define AVERROR_NOMEM       AVERROR(ENOMEM)  ///< Not enough memory
 +#define AVERROR_NOTSUPP     AVERROR(ENOSYS)  ///< Operation not supported
 +#define AVERROR_UNKNOWN     AVERROR(EINVAL)  ///< Unknown error
 +
- #define AVERROR_PATCHWELCOME    (-MKTAG('P','A','W','E')) ///< Not yet implemented in FFmpeg, patches welcome
 +
- #define AVERROR_INVALIDDATA     (-MKTAG('I','N','D','A')) ///< Invalid data found when processing input
- #define AVERROR_NUMEXPECTED     (-MKTAG('N','U','E','X')) ///< Number syntax expected in filename
- #define AVERROR_DEMUXER_NOT_FOUND  (-MKTAG(0xF8,'D','E','M')) ///< Demuxer not found
- #define AVERROR_MUXER_NOT_FOUND    (-MKTAG(0xF8,'M','U','X')) ///< Muxer not found
 +
+ #define AVERROR_BSF_NOT_FOUND      (-MKTAG(0xF8,'B','S','F')) ///< Bitstream filter not found
  #define AVERROR_DECODER_NOT_FOUND  (-MKTAG(0xF8,'D','E','C')) ///< Decoder not found
+ #define AVERROR_DEMUXER_NOT_FOUND  (-MKTAG(0xF8,'D','E','M')) ///< Demuxer not found
  #define AVERROR_ENCODER_NOT_FOUND  (-MKTAG(0xF8,'E','N','C')) ///< Encoder not found
- #define AVERROR_PROTOCOL_NOT_FOUND (-MKTAG(0xF8,'P','R','O')) ///< Protocol not found
+ #define AVERROR_EOF                (-MKTAG( 'E','O','F',' ')) ///< End of file
+ #define AVERROR_EXIT               (-MKTAG( 'E','X','I','T')) ///< Immediate exit was requested; the called function should not be restarted
  #define AVERROR_FILTER_NOT_FOUND   (-MKTAG(0xF8,'F','I','L')) ///< Filter not found
- #define AVERROR_BSF_NOT_FOUND      (-MKTAG(0xF8,'B','S','F')) ///< Bitstream filter not found
+ #define AVERROR_INVALIDDATA        (-MKTAG( 'I','N','D','A')) ///< Invalid data found when processing input
+ #define AVERROR_MUXER_NOT_FOUND    (-MKTAG(0xF8,'M','U','X')) ///< Muxer not found
+ #define AVERROR_OPTION_NOT_FOUND   (-MKTAG(0xF8,'O','P','T')) ///< Option not found
 -#define AVERROR_PATCHWELCOME       (-MKTAG( 'P','A','W','E')) ///< Not yet implemented in Libav, patches welcome
++#define AVERROR_PATCHWELCOME       (-MKTAG( 'P','A','W','E')) ///< Not yet implemented in FFmpeg, patches welcome
+ #define AVERROR_PROTOCOL_NOT_FOUND (-MKTAG(0xF8,'P','R','O')) ///< Protocol not found
  #define AVERROR_STREAM_NOT_FOUND   (-MKTAG(0xF8,'S','T','R')) ///< Stream not found
  
- #define AVERROR_EXIT (-MKTAG('E','X','I','T')) ///< Immediate exit was requested; the called function should not be restarted
  /**
   * Put a description of the AVERROR code errnum in errbuf.
   * In case of failure the global variable errno is set to indicate the
Simple merge
diff --cc libavutil/opt.c
Simple merge