Merge commit '153fadc3'

* commit '153fadc3':
  ff_get_format: fix infinite loop
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/utils.c

@@ -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);