Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Mar 2012 18:34:29 +0000 (20:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Mar 2012 18:52:52 +0000 (20:52 +0200)
* qatar/master:
  build: ppc: drop stray leftover backslash
  build: Only clean the architecture subdirectory we build for.
  build: drop some unnecessary dependencies from the H.264 parser
  build: prettyprinting cosmetics
  libavutil: Remove pointless rational test program.
  libavutil: Remove broken and pointless lzo test program.
  lavf doxy: expand AVStream.codec doxy.
  lavf doxy: improve AVStream.time_base doxy.
  lavf doxy: add some basic documentation about reading from the demuxer.
  lavf doxy: document passing options to demuxers.
  lavf doxy: clarify that an AVPacket contains encoded data.
  mpegtsenc: allow user triggered PES packet flushing
  APIchanges: mark the place where 0.7 was cut.
  APIchanges: mark the place where 0.8 was cut.
  APIchanges: fill in missing dates and hashes.
  smacker: convert palette and header reading to bytestream2.
  alac: convert extradata reading to bytestream2.

Conflicts:
doc/APIchanges
libavcodec/smacker.c
libavcodec/x86/Makefile
libavfilter/Makefile
libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
1  2 
Makefile
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/alac.c
libavcodec/smacker.c
libavcodec/x86/Makefile
libavfilter/Makefile
libavformat/Makefile
libavformat/avformat.h
libavformat/mpegtsenc.c
libavutil/Makefile
library.mak
libswscale/Makefile

diff --cc Makefile
Simple merge
diff --cc configure
+++ b/configure
@@@ -1545,11 -1419,9 +1545,11 @@@ vda_deps="VideoDecodeAcceleration_VDADe
  vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
  
  # parsers
- h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel"
+ h264_parser_select="golomb h264dsp h264pred"
  
  # external libraries
 +libaacplus_encoder_deps="libaacplus"
 +libcelt_decoder_deps="libcelt"
  libdirac_decoder_deps="libdirac !libschroedinger"
  libfaac_encoder_deps="libfaac"
  libgsm_decoder_deps="libgsm"
diff --cc doc/APIchanges
@@@ -13,42 -12,20 +13,42 @@@ libavutil:   2011-04-1
  
  API changes, most recent first:
  
 -2012-03-06 - 4d851f8 - lavu 51.25.0 - cpu.h
 -  Add av_set_cpu_flags_mask().
 +2012-03-21 - xxxxxxx - lavu 51.43.100
 +  Add bprint.h for bprint API.
 +
 +2012-02-21 - xxxxxxx - lavc 54.4.100
 +  Add av_get_pcm_codec() function.
 +
 +2012-02-16 - xxxxxxx - libswr 0.7.100
 +  Add swr_set_matrix() function.
 +
 +2012-02-09 - xxxxxxx - lavu 51.39.100
 +  Add a new installed header libavutil/timestamp.h with timestamp
 +  utilities.
 +
 +2012-02-06 - xxxxxxx - lavu 51.38.100
 +  Add av_parse_ratio() function to parseutils.h.
 +
 +2012-02-06 - xxxxxxx - lavu 51.38.100
 +  Add AV_LOG_MAX_OFFSET macro to log.h.
 +
 +2012-02-02 - xxxxxxx - lavu 51.37.100
 +  Add public timecode helpers.
 +
 +2012-01-24 - xxxxxxx - lavfi 2.60.100
 +  Add avfilter_graph_dump.
  
- 2012-xx-xx - lavc 54.8.0
-   xxxxxxx Add av_get_exact_bits_per_sample()
-   xxxxxxx Add av_get_audio_frame_duration()
+ 2012-03-05 - lavc 54.8.0
+   6699d07 Add av_get_exact_bits_per_sample()
+   9524cf7 Add av_get_audio_frame_duration()
  
- 2012-03-xx - xxxxxxx - lavc 54.7.0 - avcodec.h
+ 2012-03-04 - 44fe77b - lavc 54.7.0 - avcodec.h
    Add av_codec_is_encoder/decoder().
  
- 2012-xx-xx - xxxxxxx - lavc 54.3.0 - avcodec.h
+ 2012-03-01 - 442c132 - lavc 54.3.0 - avcodec.h
    Add av_packet_shrink_side_data.
  
- 2012-xx-xx - xxxxxxx - lavf 54.2.0 - avformat.h
+ 2012-02-29 - dd2a4bc - lavf 54.2.0 - avformat.h
    Add AVStream.attached_pic and AV_DISPOSITION_ATTACHED_PIC,
    used for dealing with attached pictures/cover art.
  
    - add41de..abc78a5 Do not include intfloat_readwrite.h,
      mathematics.h, rational.h, pixfmt.h, or log.h from avutil.h.
  
 -2011-08-16 - 48f9e45 - lavf 53.4.0
 +2011-08-16 - 48f9e45 - lavf 53.8.0
    Add avformat_query_codec().
  
 -2011-08-16 - bca06e7 - lavc 53.8.0
 +2011-08-16 - bca06e7 - lavc 53.11.0
    Add avcodec_get_type().
  
 -2011-08-06 - 2f63440 - lavf 53.4.0
 +2011-08-06 - 2f63440 - lavf 53.7.0
    Add error_recognition to AVFormatContext.
  
 -2011-08-02 - 9d39cbf - lavc 53.7.1
 +2011-08-02 - 9d39cbf - lavc 53.9.1
    Add AV_PKT_FLAG_CORRUPT AVPacket flag.
  
 -2011-07-10 - a67c061 - lavf 53.3.0
 +2011-07-16 - b57df29 - lavfi 2.27.0
 +  Add audio packing negotiation fields and helper functions.
 +
 +  In particular, add AVFilterPacking enum, planar, in_packings and
 +  out_packings fields to AVFilterLink, and the functions:
 +  avfilter_set_common_packing_formats()
 +  avfilter_all_packing_formats()
 +
 +2011-07-10 - a67c061 - lavf 53.6.0
    Add avformat_find_stream_info(), deprecate av_find_stream_info().
+   NOTE: this was backported to 0.7
  
 -2011-07-10 - 0b950fe - lavc 53.6.0
 +2011-07-10 - 0b950fe - lavc 53.8.0
    Add avcodec_open2(), deprecate avcodec_open().
+   NOTE: this was backported to 0.7
    Add avcodec_alloc_context3. Deprecate avcodec_alloc_context() and
    avcodec_alloc_context2().
  
Simple merge
Simple merge
@@@ -371,11 -365,12 +370,12 @@@ static int decode_frame(AVCodecContext 
      int blocks, blk, bw, bh;
      int i;
      int stride;
+     int flags;
  
-     if(buf_size <= 769)
+     if (avpkt->size <= 769)
          return 0;
  
 -    smk->pic.reference = 1;
 +    smk->pic.reference = 3;
      smk->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
      if(avctx->reget_buffer(avctx, &smk->pic) < 0){
          av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
      else
          smk->pic.pict_type = AV_PICTURE_TYPE_P;
  
-     buf++;
      for(i = 0; i < 256; i++)
-         *pal++ = 0xFF << 24 | bytestream_get_be24(&buf);
-     buf_size -= 769;
 -        *pal++ = bytestream2_get_be24u(&gb2);
++        *pal++ = 0xFF << 24 | bytestream2_get_be24u(&gb2);
  
      last_reset(smk->mmap_tbl, smk->mmap_last);
      last_reset(smk->mclr_tbl, smk->mclr_last);
@@@ -1,74 -1,71 +1,79 @@@
  OBJS-$(CONFIG_MLP_DECODER)             += x86/mlpdsp.o
  OBJS-$(CONFIG_TRUEHD_DECODER)          += x86/mlpdsp.o
+ OBJS-$(CONFIG_XMM_CLOBBER_TEST)        += x86/w64xmmtest.o
  
- YASM-OBJS-$(CONFIG_DCT)                += x86/dct32_sse.o
+ OBJS-$(HAVE_MMX)                       += x86/dsputil_mmx.o             \
+                                           x86/fdct_mmx.o                \
+                                           x86/fmtconvert_mmx.o          \
+                                           x86/idct_mmx_xvid.o           \
+                                           x86/idct_sse2_xvid.o          \
+                                           x86/motion_est_mmx.o          \
+                                           x86/mpegvideo_mmx.o           \
+                                           x86/simple_idct_mmx.o         \
  
 -MMX-OBJS-$(CONFIG_DWT)                 += x86/snowdsp_mmx.o
+ MMX-OBJS-$(CONFIG_AAC_DECODER)         += x86/sbrdsp_init.o
+ MMX-OBJS-$(CONFIG_AC3DSP)              += x86/ac3dsp_mmx.o
+ MMX-OBJS-$(CONFIG_CAVS_DECODER)        += x86/cavsdsp_mmx.o
+ MMX-OBJS-$(CONFIG_DNXHD_ENCODER)       += x86/dnxhd_mmx.o
++MMX-OBJS-$(CONFIG_DWT)                 += x86/snowdsp_mmx.o \
++                                          x86/dwt.o
+ MMX-OBJS-$(CONFIG_ENCODERS)            += x86/dsputilenc_mmx.o
+ MMX-OBJS-$(CONFIG_FFT)                 += x86/fft.o
+ MMX-OBJS-$(CONFIG_GPL)                 += x86/idct_mmx.o
+ MMX-OBJS-$(CONFIG_H264DSP)             += x86/h264dsp_mmx.o
+ MMX-OBJS-$(CONFIG_H264PRED)            += x86/h264_intrapred_init.o
+ MMX-OBJS-$(CONFIG_LPC)                 += x86/lpc_mmx.o
+ MMX-OBJS-$(CONFIG_MPEGAUDIODSP)        += x86/mpegaudiodec_mmx.o
+ MMX-OBJS-$(CONFIG_PNG_DECODER)         += x86/pngdsp-init.o
+ MMX-OBJS-$(CONFIG_PRORES_DECODER)      += x86/proresdsp-init.o
++MMX-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp-init.o
+ MMX-OBJS-$(CONFIG_RV30_DECODER)        += x86/rv34dsp_init.o
+ MMX-OBJS-$(CONFIG_RV40_DECODER)        += x86/rv34dsp_init.o            \
+                                           x86/rv40dsp_init.o
++MMX-OBJS-$(CONFIG_V210_DECODER)        += x86/v210-init.o
+ MMX-OBJS-$(CONFIG_VC1_DECODER)         += x86/vc1dsp_mmx.o
+ MMX-OBJS-$(CONFIG_VP5_DECODER)         += x86/vp56dsp_init.o
+ MMX-OBJS-$(CONFIG_VP6_DECODER)         += x86/vp56dsp_init.o
+ MMX-OBJS-$(CONFIG_VP8_DECODER)         += x86/vp8dsp-init.o
+ YASM-OBJS-$(CONFIG_AAC_DECODER)        += x86/sbrdsp.o
+ YASM-OBJS-$(CONFIG_AC3DSP)             += x86/ac3dsp.o
+ YASM-OBJS-$(CONFIG_DCT)                += x86/dct32_sse.o
++YASM-OBJS-$(CONFIG_DIRAC_DECODER)      += x86/diracdsp_mmx.o x86/diracdsp_yasm.o
+ YASM-OBJS-$(CONFIG_ENCODERS)           += x86/dsputilenc_yasm.o
  YASM-OBJS-FFT-$(HAVE_AMD3DNOW)         += x86/fft_3dn.o
  YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT)      += x86/fft_3dn2.o
  YASM-OBJS-FFT-$(HAVE_SSE)              += x86/fft_sse.o
  YASM-OBJS-$(CONFIG_FFT)                += x86/fft_mmx.o                 \
                                            $(YASM-OBJS-FFT-yes)
 +
 +YASM-OBJS-$(CONFIG_DWT)                += x86/dwt_yasm.o
  YASM-OBJS-$(CONFIG_H264CHROMA)         += x86/h264_chromamc.o           \
                                            x86/h264_chromamc_10bit.o
- MMX-OBJS-$(CONFIG_H264DSP)             += x86/h264dsp_mmx.o
  YASM-OBJS-$(CONFIG_H264DSP)            += x86/h264_deblock.o            \
                                            x86/h264_deblock_10bit.o      \
                                            x86/h264_idct.o               \
                                            x86/h264_idct_10bit.o         \
                                            x86/h264_weight.o             \
-                                           x86/h264_weight_10bit.o       \
+                                           x86/h264_weight_10bit.o
  YASM-OBJS-$(CONFIG_H264PRED)           += x86/h264_intrapred.o          \
                                            x86/h264_intrapred_10bit.o
- MMX-OBJS-$(CONFIG_H264PRED)            += x86/h264_intrapred_init.o
  YASM-OBJS-$(CONFIG_H264QPEL)           += x86/h264_qpel_10bit.o
- MMX-OBJS-$(CONFIG_RV30_DECODER)        += x86/rv34dsp_init.o
- YASM-OBJS-$(CONFIG_RV30_DECODER)       += x86/rv34dsp.o
- MMX-OBJS-$(CONFIG_RV40_DECODER)        += x86/rv34dsp_init.o            \
-                                           x86/rv40dsp_init.o
- YASM-OBJS-$(CONFIG_RV40_DECODER)       += x86/rv34dsp.o                 \
-                                           x86/rv40dsp.o
- YASM-OBJS-$(CONFIG_VC1_DECODER)        += x86/vc1dsp_yasm.o
- YASM-OBJS-$(CONFIG_DIRAC_DECODER)      += x86/diracdsp_mmx.o x86/diracdsp_yasm.o
- MMX-OBJS-$(CONFIG_AC3DSP)              += x86/ac3dsp_mmx.o
- YASM-OBJS-$(CONFIG_AC3DSP)             += x86/ac3dsp.o
- MMX-OBJS-$(CONFIG_CAVS_DECODER)        += x86/cavsdsp_mmx.o
- MMX-OBJS-$(CONFIG_DNXHD_ENCODER)       += x86/dnxhd_mmx.o
- MMX-OBJS-$(CONFIG_MPEGAUDIODSP)        += x86/mpegaudiodec_mmx.o
  YASM-OBJS-$(CONFIG_MPEGAUDIODSP)       += x86/imdct36_sse.o
- MMX-OBJS-$(CONFIG_ENCODERS)            += x86/dsputilenc_mmx.o
- YASM-OBJS-$(CONFIG_ENCODERS)           += x86/dsputilenc_yasm.o
- MMX-OBJS-$(CONFIG_GPL)                 += x86/idct_mmx.o
- MMX-OBJS-$(CONFIG_LPC)                 += x86/lpc_mmx.o
- YASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER)     += x86/proresdsp.o
- MMX-OBJS-$(CONFIG_PRORES_LGPL_DECODER)      += x86/proresdsp-init.o
  YASM-OBJS-$(CONFIG_PNG_DECODER)        += x86/pngdsp.o
- MMX-OBJS-$(CONFIG_PNG_DECODER)         += x86/pngdsp-init.o
  YASM-OBJS-$(CONFIG_PRORES_DECODER)     += x86/proresdsp.o
- MMX-OBJS-$(CONFIG_PRORES_DECODER)      += x86/proresdsp-init.o
- MMX-OBJS-$(CONFIG_AAC_DECODER)         += x86/sbrdsp_init.o
- YASM-OBJS-$(CONFIG_AAC_DECODER)        += x86/sbrdsp.o
- MMX-OBJS-$(CONFIG_DWT)                 += x86/snowdsp_mmx.o \
-                                           x86/dwt.o
++YASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o
+ YASM-OBJS-$(CONFIG_RV30_DECODER)       += x86/rv34dsp.o
+ YASM-OBJS-$(CONFIG_RV40_DECODER)       += x86/rv34dsp.o                 \
+                                           x86/rv40dsp.o
 +YASM-OBJS-$(CONFIG_V210_DECODER)       += x86/v210.o
- MMX-OBJS-$(CONFIG_V210_DECODER)        += x86/v210-init.o
- MMX-OBJS-$(CONFIG_VC1_DECODER)         += x86/vc1dsp_mmx.o
+ YASM-OBJS-$(CONFIG_VC1_DECODER)        += x86/vc1dsp_yasm.o
  YASM-OBJS-$(CONFIG_VP3_DECODER)        += x86/vp3dsp.o
  YASM-OBJS-$(CONFIG_VP5_DECODER)        += x86/vp3dsp.o
- MMX-OBJS-$(CONFIG_VP5_DECODER)         += x86/vp56dsp_init.o
  YASM-OBJS-$(CONFIG_VP6_DECODER)        += x86/vp3dsp.o                  \
                                            x86/vp56dsp.o
- MMX-OBJS-$(CONFIG_VP6_DECODER)         += x86/vp56dsp_init.o
  YASM-OBJS-$(CONFIG_VP8_DECODER)        += x86/vp8dsp.o
- MMX-OBJS-$(CONFIG_VP8_DECODER)         += x86/vp8dsp-init.o
  MMX-OBJS-$(HAVE_YASM)                  += x86/dsputil_yasm.o            \
                                            x86/deinterlace.o             \
                                            x86/fmtconvert.o              \
@@@ -108,68 -67,6 +108,66 @@@ OBJS-$(CONFIG_NULLSRC_FILTER
  OBJS-$(CONFIG_RGBTESTSRC_FILTER)             += vsrc_testsrc.o
  OBJS-$(CONFIG_TESTSRC_FILTER)                += vsrc_testsrc.o
  
 +OBJS-$(CONFIG_BUFFERSINK_FILTER)             += sink_buffer.o
  OBJS-$(CONFIG_NULLSINK_FILTER)               += vsink_nullsink.o
  
- DIRS = x86 libmpcodecs
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/mp_image.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/img_format.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_2xsai.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_decimate.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_denoise3d.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_detc.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_dint.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_divtc.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_down3dright.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_dsize.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_eq2.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_eq.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_field.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fil.o
 +#OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_filmdint.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fixpts.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_framestep.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fspp.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_geq.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_harddup.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_hqdn3d.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_hue.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_il.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_ilpack.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_ivtc.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_kerndeint.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_mcdeint.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_mirror.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_noise.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_ow.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_palette.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_perspective.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_phase.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_pp.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_pp7.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_pullup.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_qp.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_rectangle.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_remove_logo.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_rotate.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_sab.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_screenshot.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_smartblur.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_softpulldown.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_softskip.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_spp.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_stereo3d.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_telecine.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_tile.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_tinterlace.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_unsharp.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_uspp.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yuvcsp.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yvu9.o
 +OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
 +
 +
 +TESTPROGS = drawutils formats
 +
  TOOLS = graph2dot lavfi-showfiltfmts
@@@ -351,11 -331,7 +353,9 @@@ OBJS-$(CONFIG_LIBNUT_MUXER
  OBJS-$(CONFIG_LIBRTMP)                   += librtmp.o
  
  # protocols I/O
- OBJS+= avio.o aviobuf.o
  OBJS-$(CONFIG_APPLEHTTP_PROTOCOL)        += hlsproto.o
 +OBJS-$(CONFIG_BLURAY_PROTOCOL)           += bluray.o
 +OBJS-$(CONFIG_CACHE_PROTOCOL)            += cache.o
  OBJS-$(CONFIG_CONCAT_PROTOCOL)           += concat.o
  OBJS-$(CONFIG_CRYPTO_PROTOCOL)           += crypto.o
  OBJS-$(CONFIG_FILE_PROTOCOL)             += file.o
Simple merge
@@@ -971,10 -933,9 +971,10 @@@ static void mpegts_write_pes(AVFormatCo
          avio_write(s->pb, buf, TS_PACKET_SIZE);
      }
      avio_flush(s->pb);
 +    ts_st->prev_payload_key = key;
  }
  
- static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt)
+ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
  {
      AVStream *st = s->streams[pkt->stream_index];
      int size = pkt->size;
@@@ -82,15 -75,7 +82,12 @@@ OBJS = adler32.
  OBJS-$(ARCH_PPC) += ppc/cpu.o
  OBJS-$(ARCH_X86) += x86/cpu.o
  
 -TESTPROGS = adler32 aes avstring base64 cpu crc des eval fifo lfg lls \
 -            md5 opt parseutils sha tree
 +TESTPROGS = adler32 aes avstring base64 bprint cpu crc des eval file fifo \
 +            lfg lls md5 opt pca parseutils random_seed rational sha tree
 +TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
 +
 +TOOLS = ffeval
  
- DIRS = arm avr32 bfin mips ppc sh4 tomi x86
  ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h
 +
 +$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2
diff --cc library.mak
@@@ -45,18 -45,12 +45,16 @@@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS
        $$(LD) $(SHFLAGS) $(LDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS)
        $(SLIB_EXTRA_CMD)
  
 +ifdef SUBDIR
 +$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)
 +endif
 +
  clean::
        $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
-           $(foreach dir,$(DIRS),$(CLEANSUFFIXES:%=$(SUBDIR)$(dir)/%)) \
-           $(HOSTOBJS) $(HOSTPROGS)
+           $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(HOSTOBJS) $(HOSTPROGS)
  
  distclean:: clean
-       $(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) \
-           $(foreach dir,$(DIRS),$(DISTCLEANSUFFIXES:%=$(SUBDIR)$(dir)/%))
+       $(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%)
  
  install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
        $(Q)mkdir -p "$(SHLIBDIR)"
Simple merge