bmv: Remove unused variable
x86: fdct: Employ more specific ifdefs

This avoids building mmxext and sse2 code when disabled by configure.
avfilter/vf_phase: remove dead initialization

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avfilter/vf_drawtext: remove dead initialization

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avcodec/dpx: return different error code for unsupported depths

Also give better message in such cases.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Merge commit '9adbc3f3a1770fec9d24b8f5be3438a6c8e9e6a6'

* commit '9adbc3f3a1770fec9d24b8f5be3438a6c8e9e6a6':
  bmv: Remove unused variable

See: 63139f62f35944b9abd42505bf13a740676978e9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: fdct: Employ more specific ifdefs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
lavu/parseutils: add more resolutions

See http://en.wikipedia.org/wiki/Graphics_display_resolution

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
doc/indevs: make pulse dev formatting consistent with other devices

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
avfilter/lswsutils: dont override the default scaler

This should make no difference as this code is only used by removelogo which
seems to refuse to use masks of different size.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/dpx: refactor pixel format selection

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avcodec/dpx: support for 8 and 16 bit luma only files

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avcodec/options_table: add field_order

This allows setting and overriding the field order

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/deshake

The old row index looks weird and wrong to me

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/vf_deshake: fix block_contrast() lower brightness value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: add max_error_rate to allow tuning the point decoding errors are considered a failure of the whole transcoding.

Suggested-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/x86/vp9dsp: Fix compilation with nasm.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>