Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: FFmpeg/FFmpeg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 31ab1575e59e
Choose a base ref
...
head repository: FFmpeg/FFmpeg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c39916bc2f43
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 1, 2012

  1. cpu: improve av_get_cpu_flags() doxy

    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Oct 1, 2012
    Copy the full SHA
    64604e2 View commit details
  2. jpeglsdec: move pict debug log under correct if()

    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Oct 1, 2012
    Copy the full SHA
    c39916b View commit details
Showing with 11 additions and 6 deletions.
  1. +8 −6 libavcodec/jpeglsdec.c
  2. +3 −0 libavutil/cpu.h
14 changes: 8 additions & 6 deletions libavcodec/jpeglsdec.c
Original file line number Diff line number Diff line change
@@ -285,12 +285,14 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int point_transfor
else
shift = point_transform + (16 - s->bits);

av_dlog(s->avctx, "JPEG-LS params: %ix%i NEAR=%i MV=%i T(%i,%i,%i) RESET=%i, LIMIT=%i, qbpp=%i, RANGE=%i\n",
s->width, s->height, state->near, state->maxval,
state->T1, state->T2, state->T3,
state->reset, state->limit, state->qbpp, state->range);
av_dlog(s->avctx, "JPEG params: ILV=%i Pt=%i BPP=%i, scan = %i\n",
ilv, point_transform, s->bits, s->cur_scan);
if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
av_log(s->avctx, AV_LOG_DEBUG, "JPEG-LS params: %ix%i NEAR=%i MV=%i T(%i,%i,%i) RESET=%i, LIMIT=%i, qbpp=%i, RANGE=%i\n",
s->width, s->height, state->near, state->maxval,
state->T1, state->T2, state->T3,
state->reset, state->limit, state->qbpp, state->range);
av_log(s->avctx, AV_LOG_DEBUG, "JPEG params: ILV=%i Pt=%i BPP=%i, scan = %i\n",
ilv, point_transform, s->bits, s->cur_scan);
}
if(ilv == 0) { /* separate planes */
stride = (s->nb_components > 1) ? 3 : 1;
off = av_clip(s->cur_scan - 1, 0, stride);
3 changes: 3 additions & 0 deletions libavutil/cpu.h
Original file line number Diff line number Diff line change
@@ -60,6 +60,9 @@

/**
* Return the flags which specify extensions supported by the CPU.
* The returned value is affected by av_force_cpu_flags() if that was used
* before. So av_get_cpu_flags() can easily be used in a application to
* detect the enabled cpu flags.
*/
int av_get_cpu_flags(void);