virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'

Browse Source 
* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
  eamad: allocate a dummy reference frame when the real one is missing
  Replace remaining includes of audioconvert.h with channel_layout.h
  Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-12 15:44:15 +01:00
commit 0cfbfaaa12
8 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/012v.c
View File

@ -26,7 +26,7 @@
static av_cold int zero12v_decode_init(AVCodecContext *avctx) static av_cold int zero12v_decode_init(AVCodecContext *avctx)
{ {
avctx->pix_fmt = PIX_FMT_YUV422P16; avctx->pix_fmt = AV_PIX_FMT_YUV422P16;
avctx->bits_per_raw_sample = 10; avctx->bits_per_raw_sample = 10;
if (avctx->codec_tag == MKTAG('a', '1', '2', 'v')) if (avctx->codec_tag == MKTAG('a', '1', '2', 'v'))

13
libavcodec/eamad.c
View File

@ -271,6 +271,19 @@ static int decode_frame(AVCodecContext *avctx,
return ret; return ret;
} }
if (inter && !s->last_frame.data[0]) {
av_log(avctx, AV_LOG_WARNING, "Missing reference frame.\n");
ret = ff_get_buffer(avctx, &s->last_frame, AV_GET_BUFFER_FLAG_REF);
if (ret < 0)
return ret;
memset(s->last_frame.data[0], 0, s->last_frame.height *
s->last_frame.linesize[0]);
memset(s->last_frame.data[1], 0x80, s->last_frame.height / 2 *
s->last_frame.linesize[1]);
memset(s->last_frame.data[2], 0x80, s->last_frame.height / 2 *
s->last_frame.linesize[2]);
}
av_fast_padded_malloc(&s->bitstream_buf, &s->bitstream_buf_size, av_fast_padded_malloc(&s->bitstream_buf, &s->bitstream_buf_size,
buf_end - buf); buf_end - buf);
if (!s->bitstream_buf) if (!s->bitstream_buf)

2
libavcodec/h264.c
View File

@ -2988,7 +2988,7 @@ static int h264_set_parameter_from_sps(H264Context *h)
return 0; return 0;
} }
static enum PixelFormat get_pixel_format(H264Context *h, int force_callback) static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback)
{ {
switch (h->sps.bit_depth_luma) { switch (h->sps.bit_depth_luma) {
case 9: case 9:

2
libavcodec/svq1enc.c
View File

@ -625,7 +625,7 @@ AVCodec ff_svq1_encoder = {
.init = svq1_encode_init, .init = svq1_encode_init,
.encode2 = svq1_encode_frame, .encode2 = svq1_encode_frame,
.close = svq1_encode_end, .close = svq1_encode_end,
.pix_fmts = (const enum PixelFormat[]) { AV_PIX_FMT_YUV410P, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV410P,
AV_PIX_FMT_NONE }, AV_PIX_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"),
}; };

2
libavfilter/af_volume.c
View File

@ -24,7 +24,7 @@
* audio volume filter * audio volume filter
*/ */
#include "libavutil/audioconvert.h" #include "libavutil/channel_layout.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/eval.h" #include "libavutil/eval.h"
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"

2
libavformat/idcin.c
View File

@ -68,7 +68,7 @@
* transmitting them to the video decoder * transmitting them to the video decoder
*/ */
#include "libavutil/audioconvert.h" #include "libavutil/channel_layout.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"

2
libavutil/frame.c
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "audioconvert.h" #include "channel_layout.h"
#include "buffer.h" #include "buffer.h"
#include "common.h" #include "common.h"
#include "dict.h" #include "dict.h"

12
libswscale/swscale_unscaled.c
View File

@ -532,23 +532,23 @@ static int rgbToPlanarRgbWrapper(SwsContext *c, const uint8_t *src[],
dst[1] + srcSliceY * dstStride[1] }; dst[1] + srcSliceY * dstStride[1] };
switch (c->srcFormat) { switch (c->srcFormat) {
case PIX_FMT_RGB24: case AV_PIX_FMT_RGB24:
packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst201, packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst201,
stride201, srcSliceH, alpha_first, 3, c->srcW); stride201, srcSliceH, alpha_first, 3, c->srcW);
break; break;
case PIX_FMT_BGR24: case AV_PIX_FMT_BGR24:
packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst102, packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst102,
stride102, srcSliceH, alpha_first, 3, c->srcW); stride102, srcSliceH, alpha_first, 3, c->srcW);
break; break;
case PIX_FMT_ARGB: case AV_PIX_FMT_ARGB:
alpha_first = 1; alpha_first = 1;
case PIX_FMT_RGBA: case AV_PIX_FMT_RGBA:
packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst201, packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst201,
stride201, srcSliceH, alpha_first, 4, c->srcW); stride201, srcSliceH, alpha_first, 4, c->srcW);
break; break;
case PIX_FMT_ABGR: case AV_PIX_FMT_ABGR:
alpha_first = 1; alpha_first = 1;
case PIX_FMT_BGRA: case AV_PIX_FMT_BGRA:
packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst102, packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst102,
stride102, srcSliceH, alpha_first, 4, c->srcW); stride102, srcSliceH, alpha_first, 4, c->srcW);
break; break;