aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/jacosubdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-19 19:13:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-19 19:13:49 +0200
commit746095bc29817875ac89a7d4771f8a54895b3cbb (patch)
tree398aa4126677aef21691a4c86cbffe6af0824abd /libavformat/jacosubdec.c
parent4042c8eee1879e321092d650a421d2205aac6fe0 (diff)
parent6af2930222ee5d8ce19f3b999a78d85a3c457391 (diff)
downloadffmpeg-746095bc29817875ac89a7d4771f8a54895b3cbb.tar.gz
Merge commit '6af2930222ee5d8ce19f3b999a78d85a3c457391'
* commit '6af2930222ee5d8ce19f3b999a78d85a3c457391': pcm: Drop av_unused attribute from variable that is always used Conflicts: libavcodec/pcm.c No change as there is no such av_unused variable in ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/jacosubdec.c')
0 files changed, 0 insertions, 0 deletions