aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Langdale <philipl@overt.org>2011-03-27 09:39:16 -0700
committerPhilip Langdale <philipl@overt.org>2011-04-08 20:17:39 -0700
commitca0eed7e37881e9adea11734832dc60961693b07 (patch)
treecaffd474da69c4311c224dd48678ea217caf3e96
parent9ce1d5f03b5579a86a0ef555afbc6bb5ed472062 (diff)
downloadffmpeg-ca0eed7e37881e9adea11734832dc60961693b07.tar.gz
CrystalHD: Fix whitespace after previous change.
'git diff -w' confirmed to return nothing. Signed-off-by: Philip Langdale <philipl@overt.org>
-rw-r--r--libavcodec/crystalhd.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c
index 38c1ef7e5d..95fe931675 100644
--- a/libavcodec/crystalhd.c
+++ b/libavcodec/crystalhd.c
@@ -814,37 +814,37 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size, AVPacket *a
do {
rec_ret = receive_frame(avctx, data, data_size, 0);
if (rec_ret == RET_OK && *data_size == 0) {
- /*
- * This case is for when the encoded fields are stored
- * separately and we get a separate avpkt for each one. To keep
- * the pipeline stable, we should return nothing and wait for
- * the next time round to grab the second field.
- * H.264 PAFF is an example of this.
- */
- av_log(avctx, AV_LOG_VERBOSE, "Returning after first field.\n");
- avctx->has_b_frames--;
+ /*
+ * This case is for when the encoded fields are stored
+ * separately and we get a separate avpkt for each one. To keep
+ * the pipeline stable, we should return nothing and wait for
+ * the next time round to grab the second field.
+ * H.264 PAFF is an example of this.
+ */
+ av_log(avctx, AV_LOG_VERBOSE, "Returning after first field.\n");
+ avctx->has_b_frames--;
} else if (rec_ret == RET_COPY_NEXT_FIELD) {
- /*
- * This case is for when the encoded fields are stored in a
- * single avpkt but the hardware returns then separately. Unless
- * we grab the second field before returning, we'll slip another
- * frame in the pipeline and if that happens a lot, we're sunk.
- * So we have to get that second field now.
- * Interlaced mpeg2 and vc1 are examples of this.
- */
- av_log(avctx, AV_LOG_VERBOSE, "Trying to get second field.\n");
- while (1) {
- usleep(priv->decode_wait);
- ret = DtsGetDriverStatus(dev, &decoder_status);
- if (ret == BC_STS_SUCCESS &&
- decoder_status.ReadyListCount > 0) {
- rec_ret = receive_frame(avctx, data, data_size, 1);
- if ((rec_ret == RET_OK && *data_size > 0) ||
- rec_ret == RET_ERROR)
- break;
- }
+ /*
+ * This case is for when the encoded fields are stored in a
+ * single avpkt but the hardware returns then separately. Unless
+ * we grab the second field before returning, we'll slip another
+ * frame in the pipeline and if that happens a lot, we're sunk.
+ * So we have to get that second field now.
+ * Interlaced mpeg2 and vc1 are examples of this.
+ */
+ av_log(avctx, AV_LOG_VERBOSE, "Trying to get second field.\n");
+ while (1) {
+ usleep(priv->decode_wait);
+ ret = DtsGetDriverStatus(dev, &decoder_status);
+ if (ret == BC_STS_SUCCESS &&
+ decoder_status.ReadyListCount > 0) {
+ rec_ret = receive_frame(avctx, data, data_size, 1);
+ if ((rec_ret == RET_OK && *data_size > 0) ||
+ rec_ret == RET_ERROR)
+ break;
}
- av_log(avctx, AV_LOG_VERBOSE, "CrystalHD: Got second field.\n");
+ }
+ av_log(avctx, AV_LOG_VERBOSE, "CrystalHD: Got second field.\n");
} else if (rec_ret == RET_SKIP_NEXT_COPY) {
/*
* Two input packets got turned into a field pair. Gawd.