History

Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'

* commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a': avcodec: Deprecate dtg_active_format field in favor of avframe side-data Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/mpeg12dec.c libavcodec/version.h libavfilter/vf_showinfo.c libavutil/frame.h libavutil/version.h

Michael Niedermayer committed 12 years ago

Commit 71d008e2 parents 2a3c36e 1ef9e835 files · +21 −22Browse files

Showing the changes to libavfilter (1 of 5 files). Show all

Unified · Split

libavfilter/vf_showinfo.c+1−1
@@ -148,7 +148,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 147 unmodified lines
148148 av_display_rotation_get((int32_t *)sd->data));
149149 break;
150150 case AV_FRAME_DATA_AFD:
151− av_log(ctx, AV_LOG_INFO, "afd: value of %u", sd->data[0]);
151+ av_log(ctx, AV_LOG_INFO, "afd: value of %"PRIu8, sd->data[0]);
152152 break;
153153 default:
154154 av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)",

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t