diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-27 14:21:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-27 14:31:04 +0100 |
| commit | 577b39aea221ddc9606f3b5ca698516155cdfd43 (patch) | |
| tree | 115c086bc6eed1f4e60468c5ace8228c31c3cbf5 /libavcodec | |
| parent | b4d4e51027e0c55e35c081cb180396ab04099b2f (diff) | |
| parent | 6e5cdf26281945ddea3aaf5eca4d127791f23ca8 (diff) | |
| download | ffmpeg-577b39aea221ddc9606f3b5ca698516155cdfd43.tar.gz | |
Merge commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8'
* commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8':
h264: check ref_count validity for num_ref_idx_active_override_flag
h264: add missing new line to log message
dcadec: skip QMF on unused channels
wavenc: write fact chunk sample count at the correct file position
riff: do not add empty metadata tags in INFO chunk
Conflicts:
libavcodec/dcadec.c
libavcodec/h264.c
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dcadec.c | 8 | ||||
| -rw-r--r-- | libavcodec/h264.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 0ebbc64ffc..8b985a86cf 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -1440,10 +1440,10 @@ static int dca_filter_channels(DCAContext *s, int block_index) for (k = 0; k < s->prim_channels; k++) { /* static float pcm_to_double[8] = { 32768.0, 32768.0, 524288.0, 524288.0, 0, 8388608.0, 8388608.0 };*/ - if(s->channel_order_tab[k] >= 0) - qmf_32_subbands(s, k, subband_samples[k], - s->samples_chanptr[s->channel_order_tab[k]], - M_SQRT1_2 / 32768.0 /* pcm_to_double[s->source_pcm_res] */); + if (s->channel_order_tab[k] >= 0) + qmf_32_subbands(s, k, subband_samples[k], + s->samples_chanptr[s->channel_order_tab[k]], + M_SQRT1_2 / 32768.0 /* pcm_to_double[s->source_pcm_res] */); } /* Down mixing */ diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 0413ba470c..094333d9fd 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2931,9 +2931,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0) if (num_ref_idx_active_override_flag) { h->ref_count[0] = get_ue_golomb(&s->gb) + 1; - if (h->slice_type_nos == AV_PICTURE_TYPE_B) + if (h->slice_type_nos == AV_PICTURE_TYPE_B) { h->ref_count[1] = get_ue_golomb(&s->gb) + 1; - else + } else // full range is spec-ok in this case, even for frames h->ref_count[1] = 1; } |