Merge commit '153fadc390d05aa47e5e2c56290401898fe41a23'

* commit '153fadc390d05aa47e5e2c56290401898fe41a23':
  ff_get_format: fix infinite loop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-07 02:15:07 +02:00
commit a52384dcda

View File

@ -1233,7 +1233,7 @@ int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt)
do
choices[n] = choices[n + 1];
while (choices[n] != AV_PIX_FMT_NONE);
while (choices[n++] != AV_PIX_FMT_NONE);
}
av_freep(&choices);